diff options
| author | jlam <jlam@pkgsrc.org> | 2001-08-14 03:41:37 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2001-08-14 03:41:37 +0000 |
| commit | e085ee5316bc26e385bb335fa2dfa61551ff2589 (patch) | |
| tree | be92c5758d72a625f5cd1f8562ab245b28dc9940 /sysutils/ups-nut | |
| parent | 1bea6ca246eeb383e553bc08fcd6672560ab8db7 (diff) | |
| download | pkgsrc-e085ee5316bc26e385bb335fa2dfa61551ff2589.tar.gz | |
grep isn't used anymore, so don't substitute for @GREP@ in the INSTALL
files. Substitute for @ID@ instead of directly using 'id', and use the
value of ${ID} already set in defs.*.mk.
Diffstat (limited to 'sysutils/ups-nut')
| -rw-r--r-- | sysutils/ups-nut/Makefile | 4 | ||||
| -rw-r--r-- | sysutils/ups-nut/pkg/INSTALL | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/sysutils/ups-nut/Makefile b/sysutils/ups-nut/Makefile index 1f328036bc6..eaab1147d89 100644 --- a/sysutils/ups-nut/Makefile +++ b/sysutils/ups-nut/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2001/04/01 14:04:36 martin Exp $ +# $NetBSD: Makefile,v 1.8 2001/08/14 03:41:39 jlam Exp $ # DISTNAME= nut-0.44.3-pre5 @@ -59,7 +59,7 @@ pre-install: -e 's|@ADDUSER@|${ADDUSER}|g' \ -e 's|@ADDGROUP@|${ADDGROUP}|g' \ -e 's|@CHGRP@|${CHGRP}|g' \ - -e 's|@GREP@|${GREP}|g' \ + -e 's|@ID@|${ID}|g' \ -e 's|@RM@|${RM}|g' \ -e 's|@TOUCH@|${TOUCH}|g' \ < ${PKGDIR}/INSTALL > ${INSTALL_FILE} diff --git a/sysutils/ups-nut/pkg/INSTALL b/sysutils/ups-nut/pkg/INSTALL index 055fb288fc7..10de348e8e5 100644 --- a/sysutils/ups-nut/pkg/INSTALL +++ b/sysutils/ups-nut/pkg/INSTALL @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: INSTALL,v 1.2 2001/08/12 19:55:57 veego Exp $ +# $NetBSD: INSTALL,v 1.3 2001/08/14 03:41:39 jlam Exp $ USER=@NUT_USER@ GROUP=@NUT_GROUP@ @@ -8,7 +8,7 @@ GROUP=@NUT_GROUP@ ADDUSER="@ADDUSER@" ADDGROUP="@ADDGROUP@" CHGRP="@CHGRP@" -GREP="@GREP@" +ID="@ID@" RM="@RM@" TOUCH="@TOUCH@" @@ -30,7 +30,7 @@ ${RM} -f "/tmp/grouptest.$$" # Use `id' to be able to use NIS. # -id ${USER} 2>/dev/null >/dev/null +${ID} ${USER} 2>/dev/null >/dev/null if [ $? -eq 0 ] then echo "User '${USER}' already exists...proceeding." |