r10656: BIG merge from trunk. Features not copied over

[amitay/samba.git] / source3 / script / installswat.sh

diff --git a/source3/script/installswat.sh b/source3/script/installswat.sh
index c0285bda5589f6570788899aeec36c417df18e36..cba3a294f871a51cd586f8ecb7e78749126c26e1 100755 (executable)
--- a/source3/script/installswat.sh
+++ b/source3/script/installswat.sh
@@ -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; do
+       $SWATLANGDIR/include $SWATLANGDIR/js; 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/*.gif; do
+  for f in $SRCDIR../swat/$ln/images/*.png; 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/*.html; do
+  for f in $SRCDIR../swat/$ln/include/*; do
       if [ ! -f $f ] ; then
        continue
       fi
@@ -69,17 +69,58 @@ 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)
 
 if [ -d $SRCDIR../docs/htmldocs/ ]; then
 
-    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
+    for dir in htmldocs/ htmldocs/Samba-HOWTO-Collection htmldocs/Samba-Guide htmldocs/Samba-Developers-Guide
+    do 
+    
+      if [ ! -d $SRCDIR../docs/$dir ]; then
+        continue
+      fi
+      
+      INSTALLDIR=$SWATDIR/help/`echo $dir | sed 's/htmldocs\///g'`
+      if [ ! -d $INSTALLDIR ]; then
+        mkdir $INSTALLDIR
+      fi
+
+      for f in $SRCDIR../docs/$dir/*.html; do
+         FNAME=$INSTALLDIR/`basename $f`
+         echo $FNAME
+         cp $f $FNAME || echo Cannot install $FNAME. Does $USER have privileges?
+         chmod 0644 $FNAME
+      done
+
+      if [ -d $SRCDIR../docs/$dir/images/ ]; then
+          if [ ! -d $INSTALLDIR/images/ ]; then
+              mkdir $INSTALLDIR/images
+              if [ ! -d $INSTALLDIR/images/ ]; then
+                  echo Failed to make directory $SWATDIR/help/images, does $USER have privileges?
+                  exit 1
+              fi
+          fi
+          for f in $SRCDIR../docs/$dir/images/*.png; do
+              FNAME=$INSTALLDIR/images/`basename $f`
+              echo $FNAME
+              cp $f $FNAME || echo Cannot install $FNAME. Does $USER have privileges?
+              chmod 0644 $FNAME
+          done
+      fi
     done
 fi
 
@@ -128,7 +169,7 @@ fi
 
 cat << EOF
 ======================================================================
-The SWAT files have been installed. Remember to read the swat/README
+The SWAT files have been installed. Remember to read the documentation
 for information on enabling and using SWAT
 ======================================================================
 EOF