From d197798f653f3eef337e6e46a34d91b1f205564c Mon Sep 17 00:00:00 2001
From: dsomero <xgizzmo@slackbuilds.org>
Date: Fri, 8 Apr 2011 20:47:37 -0400
Subject: system/webmin: Updated for version 1.540.

Signed-off-by: dsomero <xgizzmo@slackbuilds.org>
---
 system/webmin/webmin.SlackBuild | 22 ++++++++--------------
 1 file changed, 8 insertions(+), 14 deletions(-)

(limited to 'system/webmin/webmin.SlackBuild')

diff --git a/system/webmin/webmin.SlackBuild b/system/webmin/webmin.SlackBuild
index 48816b914c..9691227750 100644
--- a/system/webmin/webmin.SlackBuild
+++ b/system/webmin/webmin.SlackBuild
@@ -23,11 +23,12 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=webmin
-VERSION=1.510
-ARCH=noarch
+VERSION=1.540
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
+ARCH=noarch
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=${TMP}/package-${PRGNAM}
@@ -49,7 +50,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.*z*
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
@@ -108,28 +109,21 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 # Find config files and add the .new.
-# Used by the next block of code.
 get_config_files() {
   for i in $(ls -1 $1); do
     if [ -d "$1/$i" ]; then
       get_config_files "$1/$i"
     else
-      echo -n "$1/$i.new " | sed -e "s/^$(echo $PKG | sed -e 's/\//\\\//g')\///g"
+      echo "preserve_perms $1/$i.new " | sed -e "s#$PKG/##g" \
+        >> $PKG/install/doinst.sh
       mv "$1/$i" "$1/$i.new"
     fi
   done
 }
 
-# Finish the doinst.sh by adding the .new file list and config loop
+# Finish the doinst.sh by adding the .new file handler.
 if [ -e $PKG/etc ]; then 
-  etc_files=$(get_config_files $PKG/etc)
-
-cat <<DOINST >> $PKG/install/doinst.sh
-for FILE in $etc_files
-do
-  config \$FILE
-done
-DOINST
+  get_config_files $PKG/etc
 fi
 
 # Fix a few ownership issues
-- 
cgit v1.2.3