summaryrefslogtreecommitdiff
path: root/sysutils
diff options
context:
space:
mode:
authorEivind Eklund <eivind@FreeBSD.org>2003-08-20 15:11:43 +0000
committerEivind Eklund <eivind@FreeBSD.org>2003-08-20 15:11:43 +0000
commitf2fbc2ba1c641ce21d5e8c1c57850dc62b636883 (patch)
treec35f95bf5a075b9babfb183b314587f990549757 /sysutils
parentUpdate to 1.8.5. (diff)
I had been testing the wrong version.
Fix a couple of typos that made etc not work at all. :-(
Notes
Notes: svn path=/head/; revision=87386
Diffstat (limited to 'sysutils')
-rw-r--r--sysutils/etcmerge/Makefile1
-rw-r--r--sysutils/etcmerge/src/etcmerge.sh4
2 files changed, 3 insertions, 2 deletions
diff --git a/sysutils/etcmerge/Makefile b/sysutils/etcmerge/Makefile
index 5f8b2426781c..cd1a79755f21 100644
--- a/sysutils/etcmerge/Makefile
+++ b/sysutils/etcmerge/Makefile
@@ -9,6 +9,7 @@
PORTNAME= etcmerge
PORTVERSION= 0.2
+PORTREVISION= 1
CATEGORIES= sysutils textproc
MASTER_SITES= # none
DISTFILES= # none
diff --git a/sysutils/etcmerge/src/etcmerge.sh b/sysutils/etcmerge/src/etcmerge.sh
index 31ea1e5e7b7d..62c0eaa39e0a 100644
--- a/sysutils/etcmerge/src/etcmerge.sh
+++ b/sysutils/etcmerge/src/etcmerge.sh
@@ -126,7 +126,7 @@ case "$1" in
# XXX Check for need?
/usr/sbin/pwd_mkdb -d etc-merged -p etc-merged/master.passwd
/usr/bin/cap_mkdb etc-merged/login.conf
- if diff -q /etc/mail/aliases etc-merged/mail/aliases > /dev/null
+ if diff -q /etc/mail/aliases etc-merged/mail/aliases > /dev/null; then
NEED_NEWALIASES=yes
else
NEED_NEWALIASES=no
@@ -155,7 +155,7 @@ case "$1" in
mv ${tmpetc} /etc
fsync /
if [ "${NEED_NEWALIASES}" = "yes" ]; then
- /usr/sbin/newaliases
+ /usr/bin/newaliases
fi
mv ${REFETC} ${REFETC}.etcmergeold
mv ${REFETC}.etcmerge ${REFETC}