1 files changed, 16 insertions, 110 deletions
diff --git a/source4/script/installswat.sh b/source4/script/installswat.sh
index c66604cdb8..dbf0e7351f 100644
--- a/source4/script/installswat.sh
+++ b/source4/script/installswat.sh
@@ -1,125 +1,31 @@
 #!/bin/sh
-#fist version March 1998, Andrew Tridgell
 
 SWATDIR=$1
 SRCDIR=$2/
-BOOKDIR=$SWATDIR/using_samba
 
-echo Installing SWAT in $SWATDIR
-echo Installing the Samba Web Administration Tool
+echo Installing swat files in $SWATDIR
 
-LANGS=". `cd $SRCDIR../swat/; /bin/echo lang/??`"
-echo Installing langs are `cd $SRCDIR../swat/lang/; /bin/echo ??`
+cd $SRCDIR/../swat || exit 1
 
-for ln in $LANGS; do 
- SWATLANGDIR=$SWATDIR/$ln
- for d in $SWATLANGDIR $SWATLANGDIR/help $SWATLANGDIR/images \
-	$SWATLANGDIR/include; do
-    if [ ! -d $d ]; then
-	mkdir -p $d
-	if [ ! -d $d ]; then
-	    echo Failed to make directory $d, does $USER have privileges?
-	    exit 1
-	fi
-    fi
- done
-done
-
-# Install images
-for ln in $LANGS; do
-
-for f in $SRCDIR../swat/$ln/images/*.gif; do
-      FNAME=$SWATDIR/$ln/images/`basename $f`
-      echo $FNAME
-      cp $f $FNAME || echo Cannot install $FNAME. Does $USER have privileges?
-      chmod 0644 $FNAME
-done
-
-# Install html help
-
-for f in $SRCDIR../swat/$ln/help/*.html; do
-      FNAME=$SWATDIR/$ln/help/`basename $f`
-      echo $FNAME
-      if [ "x$BOOKDIR" = "x" ]; then
-        cat $f | sed 's/@BOOKDIR@.*$//' > $f.tmp
-      else
-        cat $f | sed 's/@BOOKDIR@//' > $f.tmp
-      fi
-      f=$f.tmp
-      cp $f $FNAME || echo Cannot install $FNAME. Does $USER have privileges?
-      rm -f $f
-      chmod 0644 $FNAME
-done
-
-# Install html documentation
-
-for f in $SRCDIR../docs/htmldocs/*.html; do
-      FNAME=$SWATDIR/help/`basename $f`
-      echo $FNAME
-      cp $f $FNAME || echo Cannot install $FNAME. Does $USER have privileges?
-      chmod 0644 $FNAME
-done
-
-# Install "server-side" includes
-
-for f in $SRCDIR../swat/$ln/include/*.html; do
-      FNAME=$SWATDIR/$ln/include/`basename $f`
-      echo $FNAME
-      cp $f $FNAME || echo Cannot install $FNAME. Does $USER have privileges?
-      chmod 0644 $FNAME
-done
-
-done
-
-# Install Using Samba book
-
-if [ "x$BOOKDIR" != "x" ]; then
-
-    # Create directories
-
-    for d in $BOOKDIR $BOOKDIR/figs $BOOKDIR/gifs; do
-        if [ ! -d $d ]; then
-            mkdir $d
-            if [ ! -d $d ]; then
-                echo Failed to make directory $d, does $USER have privileges?
-                exit 1
-            fi
-        fi
-    done
-
-    # HTML files
-
-    for f in $SRCDIR../docs/htmldocs/using_samba/*.html; do
-        FNAME=$BOOKDIR/`basename $f`
-        echo $FNAME
-        cp $f $FNAME || echo Cannot install $FNAME. Does $USER have privileges?
-        chmod 0644 $FNAME
-    done
-
-    # Figures
-
-    for f in $SRCDIR../docs/htmldocs/using_samba/figs/*.gif; do
-        FNAME=$BOOKDIR/figs/`basename $f`
-        echo $FNAME
-        cp $f $FNAME || echo Cannot install $FNAME. Does $USER have privileges?
-        chmod 0644 $FNAME
-    done
-
-    # Gifs
-
-    for f in $SRCDIR../docs/htmldocs/using_samba/gifs/*.gif; do
-        FNAME=$BOOKDIR/gifs/`basename $f`
-        echo $FNAME
-        cp $f $FNAME || echo Cannot install $FNAME. Does $USER have privileges?
-        chmod 0644 $FNAME
+installdir() {
+    dir=$1
+    ext=$2
+    mkdir -p $SWATDIR/$dir || exit 1
+    for f in $dir/*.$ext; do
+	echo Installing $f
+	cp $f $SWATDIR/$dir/ || exit 1
+	chmod 0644 $SWATDIR/$f || exit 1
     done
+}
 
-fi
+installdir html html
+installdir html/esptest html
+installdir html/images png
+installdir scripting ejs
 
 cat << EOF
 ======================================================================
-The SWAT files have been installed. Remember to read the swat/README
-for information on enabling and using SWAT
+The swat files have been installed. 
 ======================================================================
 EOF