summaryrefslogtreecommitdiff
path: root/www/wwwoffle
diff options
context:
space:
mode:
authorfredb <fredb@pkgsrc.org>2002-11-08 15:34:21 +0000
committerfredb <fredb@pkgsrc.org>2002-11-08 15:34:21 +0000
commitae54016cd8c3e4e2ad7032ca52c6f301682e8086 (patch)
treef3ead5d113ac3cdf3971c1f84c6d4b3519771db2 /www/wwwoffle
parente01ee24b74a94813113f6834491c6fc1449e64cf (diff)
downloadpkgsrc-ae54016cd8c3e4e2ad7032ca52c6f301682e8086.tar.gz
Do as intended all along with the old config handling, and choose the
newest of the possible candidates. Update comment -- there are now multiple wwwoffle.pac files.
Diffstat (limited to 'www/wwwoffle')
-rw-r--r--www/wwwoffle/INSTALL12
1 files changed, 6 insertions, 6 deletions
diff --git a/www/wwwoffle/INSTALL b/www/wwwoffle/INSTALL
index 9686d538b2d..c96398cb936 100644
--- a/www/wwwoffle/INSTALL
+++ b/www/wwwoffle/INSTALL
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: INSTALL,v 1.3 2002/09/05 15:34:19 fredb Exp $
+# $NetBSD: INSTALL,v 1.4 2002/11/08 15:34:21 fredb Exp $
if [ X"${2}" != XPOST-INSTALL ]
then
@@ -28,14 +28,14 @@ fi
# fresh one.
if [ ! -e "${CONFDIR}/wwwoffle.conf" ]
then
- if [ -e /etc/wwwoffle.conf ]
- then
- conf_candidates=/etc/wwwoffle.conf
- fi
if [ -e "${PKG_PREFIX}/etc/wwwoffle.conf" ]
then
conf_candidates="${PKG_PREFIX}/etc/wwwoffle.conf"
fi
+ if [ -e /etc/wwwoffle.conf ]
+ then
+ conf_candidates="$conf_candidates /etc/wwwoffle.conf"
+ fi
OLD_CONF="$(ls -rt $conf_candidates | tail -1)"
if [ -n "$OLD_CONF" ]
then
@@ -51,7 +51,7 @@ then
cp "${NEW_CONF_EXAMPLE}" "${CONFDIR}/wwwoffle.conf.install"
fi
-# Put the real hostname in the "wwwoffle.pac" file.
+# Put the real hostname in the "wwwoffle.pac" files.
for p in `find /var/wwwoffle/html -name wwwoffle.pac`
do
cd `dirname ${p}`