r12393: cleaning up swat bugs. *no one* tests swat it seems. This has been broken since r10656

(This used to be commit 85ea7afd8bd30e0a2bcbc7181f75fde63b016a34)

1 files changed, 4 insertions, 16 deletions

diff --git a/source3/script/installswat.sh b/source3/script/installswat.sh
index c5c285894e..c66fd29485 100755
--- a/source3/script/installswat.sh
+++ b/source3/script/installswat.sh
@@ -3,7 +3,7 @@
 
 SWATDIR=`echo $1 | sed 's/\/\//\//g'`
 SRCDIR=$2/
-BOOKDIR=$SWATDIR/using_samba
+BOOKDIR=$SWATDIR/help/using_samba
 
 echo Installing SWAT in $SWATDIR
 echo Installing the Samba Web Administration Tool
@@ -14,7 +14,7 @@ echo Installing langs are `cd $SRCDIR../swat/lang/; /bin/echo ??`
 for ln in $LANGS; do 
  SWATLANGDIR=$SWATDIR/$ln
  for d in $SWATLANGDIR $SWATLANGDIR/help $SWATLANGDIR/images \
-	$SWATLANGDIR/include $SWATLANGDIR/js; do
+	$SWATLANGDIR/include; do
     if [ ! -d $d ]; then
 	mkdir -p $d
 	if [ ! -d $d ]; then
@@ -28,7 +28,7 @@ done
 # Install images
 for ln in $LANGS; do
 
-  for f in $SRCDIR../swat/$ln/images/*.png; do
+  for f in $SRCDIR../swat/$ln/images/*.gif; do
       if [ ! -f $f ] ; then
 	continue
       fi
@@ -59,7 +59,7 @@ for ln in $LANGS; do
 
   # Install "server-side" includes
 
-  for f in $SRCDIR../swat/$ln/include/*; do
+  for f in $SRCDIR../swat/$ln/include/*.html; do
       if [ ! -f $f ] ; then
 	continue
       fi
@@ -69,18 +69,6 @@ for ln in $LANGS; do
       chmod 0644 $FNAME
   done
 
-  # Install javascripts
-
-  for f in $SRCDIR../swat/$ln/js/*.js; do
-      if [ ! -f $f ] ; then
-	continue
-      fi
-      FNAME=$SWATDIR/$ln/js/`basename $f`
-      echo $FNAME
-      cp $f $FNAME || echo Cannot install $FNAME. Does $USER have privileges?
-      chmod 0644 $FNAME
-  done
-
 done
 
 # Install html documentation (if html documentation tree is here)