[Pkg-awstats-commits] [SCM] awstats Debian packaging branch, master, updated. debian/7.0_dfsg-1-8-g93ad212

Jonas Smedegaard dr at jones.dk
Wed Mar 16 18:46:22 UTC 2011


The following commit has been merged in the master branch:
commit 4c30d47df941096907f7a4e7be63809ac6aef846
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Wed Mar 16 19:44:11 2011 +0100

    Revert "Resolve configfile stems using find."
    
    This reverts commit de0d3afceb4d188fd136f3817a3c3d81f07d03e7.

diff --git a/debian/buildstatic.sh b/debian/buildstatic.sh
index 777e9df..200f02b 100755
--- a/debian/buildstatic.sh
+++ b/debian/buildstatic.sh
@@ -26,11 +26,11 @@ AWSTATS_LANG="en"
 
 [ "$AWSTATS_ENABLE_BUILDSTATICPAGES" = "yes" ] || exit 0
 
-# Resolve stems of available configfiles
-cfgfiles=`find /etc/awstats -name awstats.conf -or -name 'awstats.*.conf' \
-	| sed -e 's/\.conf$//;s/^.*\///;s/^awstats\.//'`
+cd /etc/awstats
 
-for c in $cfgfiles
+for c in `/bin/ls -1 awstats.*.conf 2>/dev/null | \
+          /bin/sed 's/^awstats\.\(.*\)\.conf/\1/'` \
+         `[ -f /etc/awstats/awstats.conf ] && echo awstats`
 do
   mkdir -p /var/cache/awstats/$c/$YEAR/$MONTH/
 
diff --git a/debian/update.sh b/debian/update.sh
index 4ab1c6c..f62078f 100755
--- a/debian/update.sh
+++ b/debian/update.sh
@@ -19,11 +19,11 @@ trap 'rm -f $ERRFILE' INT QUIT TERM EXIT
 AWSTATS_NICE=10
 [ ! -r "$DEFAULT" ] || . "$DEFAULT"
 
-# Resolve stems of available configfiles
-cfgfiles=`find /etc/awstats -name awstats.conf -or -name 'awstats.*.conf' \
-	| sed -e 's/\.conf$//;s/^.*\///;s/^awstats\.//'`
+cd /etc/awstats
 
-for c in $cfgfiles
+for c in `/bin/ls -1 awstats.*.conf 2>/dev/null | \
+          /bin/sed 's/^awstats\.\(.*\)\.conf/\1/'` \
+         `[ -f /etc/awstats/awstats.conf ] && echo awstats`
 do
   if ! nice -n $AWSTATS_NICE $AWSTATS \
 	  -config=$c \

-- 
awstats Debian packaging



More information about the Pkg-awstats-commits mailing list