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

[Jonas Smedegaard]

The following commit has been merged in the master branch:
commit de0d3afceb4d188fd136f3817a3c3d81f07d03e7
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Wed Mar 16 17:27:51 2011 +0100

    Resolve configfile stems using find.

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

-- 
awstats Debian packaging