adduser rmuser: Customizable prefix

[pw-darwin.git] / adduser / rmuser.sh

diff --git a/adduser/rmuser.sh b/adduser/rmuser.sh
index abaf004e7f6699962c7b8b675f76f9c7c6741b0d..92522160f3ad43552a338da94b5f11f7ae869db6 100644 (file)
--- a/adduser/rmuser.sh
+++ b/adduser/rmuser.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!@MEMO_PREFIX@/bin/sh
 #
 # SPDX-License-Identifier: BSD-2-Clause-FreeBSD
 #
@@ -29,13 +29,13 @@
 # $FreeBSD$
 #
 
-ATJOBDIR="/var/at/jobs"
-CRONJOBDIR="/var/cron/tabs"
-MAILSPOOL="/var/mail"
+ATJOBDIR="@MEMO_PREFIX@/var/at/jobs"
+CRONJOBDIR="@MEMO_PREFIX@/var/cron/tabs"
+MAILSPOOL="@MEMO_PREFIX@/var/mail"
 SIGKILL="-KILL"
-TEMPDIRS="/tmp /var/tmp"
-THISCMD=`/usr/bin/basename $0`
-PWCMD="${PWCMD:-/usr/sbin/pw}"
+TEMPDIRS="@MEMO_PREFIX@/tmp @MEMO_PREFIX@/var/tmp"
+THISCMD=`@MEMO_PREFIX@@MEMO_SUB_PREFIX@/bin/basename $0`
+PWCMD="${PWCMD:-@MEMO_PREFIX@@MEMO_PREFIX@/sbin/pw}"
 
 # err msg
 #      Display $msg on stderr.
@@ -156,7 +156,7 @@ rm_ipc() {
        for i in s m q; do
                ipcs -$i |
                awk -v i=$i -v login=$1 '$1 == i && $5 == login { print $2 }' |
-               xargs -n 1 ipcrm -$i
+               xargs -r -n 1 ipcrm -$i
        done
        verbose && echo '.'
 }
@@ -230,7 +230,7 @@ userlist=
 yflag=
 vflag=
 
-procowner=`/usr/bin/id -u`
+procowner=`@MEMO_PREFIX@@MEMO_SUB_PREFIX@/bin/id -u`
 if [ "$procowner" != "0" ]; then
        err 'you must be root (0) to use this utility.'
        exit 1