diff options
| author | eivind <eivind@FreeBSD.org> | 2003-08-20 23:11:43 +0800 |
|---|---|---|
| committer | eivind <eivind@FreeBSD.org> | 2003-08-20 23:11:43 +0800 |
| commit | 5cb0b14749c8a0a7cbcbfc1915c058119f092df1 (patch) | |
| tree | 222dcff1668c8f7aa56668246e91cdb63ae558be /sysutils/etcmerge | |
| parent | 8964cc5e2ae747d529859236b3c61e9f1b3209ab (diff) | |
| download | freebsd-ports-gnome-5cb0b14749c8a0a7cbcbfc1915c058119f092df1.tar.gz freebsd-ports-gnome-5cb0b14749c8a0a7cbcbfc1915c058119f092df1.tar.zst freebsd-ports-gnome-5cb0b14749c8a0a7cbcbfc1915c058119f092df1.zip | |
I had been testing the wrong version.
Fix a couple of typos that made etc not work at all. :-(
Diffstat (limited to 'sysutils/etcmerge')
| -rw-r--r-- | sysutils/etcmerge/Makefile | 1 | ||||
| -rw-r--r-- | sysutils/etcmerge/src/etcmerge.sh | 4 |
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} |