From e5edc3e9f3008fbff8786be4650dd4e5aa7b152d Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Thu, 12 Mar 1998 03:12:30 +0000
Subject: added an install target for SWAT (This used to be commit
 1a87b2c2b61b3785b6a6597b220fec611c5872e6)

---
 source3/script/installswat.sh | 41 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)
 create mode 100755 source3/script/installswat.sh

(limited to 'source3/script/installswat.sh')

diff --git a/source3/script/installswat.sh b/source3/script/installswat.sh
new file mode 100755
index 0000000000..dcdfc530b4
--- /dev/null
+++ b/source3/script/installswat.sh
@@ -0,0 +1,41 @@
+#!/bin/sh
+#fist version March 1998, Andrew Tridgell
+
+SWATDIR=$1
+SRCDIR=$2
+
+echo Installing the Samba Web Admisistration Tool
+
+for d in $SWATDIR $SWATDIR/help $SWATDIR/images; 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
+
+for f in $SRCDIR../swat/images/*.gif; do
+      FNAME=$SWATDIR/images/`basename $f`
+      echo $FNAME
+      cp $f $FNAME || echo Cannot install $FNAME. Does $USER have privileges?
+      chmod 0644 $FNAME
+done
+
+for f in $SRCDIR../swat/help/*.html; do
+      FNAME=$SWATDIR/help/`basename $f`
+      echo $FNAME
+      cp $f $FNAME || echo Cannot install $FNAME. Does $USER have privileges?
+      chmod 0644 $FNAME
+done
+
+cat << EOF
+======================================================================
+The SWAT files have been installed. Remember to read the web/README
+for information on enabling and using SWAT
+======================================================================
+EOF
+
+exit 0
+
-- 
cgit 


From b56333a181dffa1d6880ca359e0327b2eb0448e4 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Sat, 14 Mar 1998 01:26:46 +0000
Subject: fixed instructions in installswat.sh (thanks to Herb again!) (This
 used to be commit 5e25c845c7c9fe3330cd84e84cfc9b08d77d8cc3)

---
 source3/script/installswat.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3/script/installswat.sh')

diff --git a/source3/script/installswat.sh b/source3/script/installswat.sh
index dcdfc530b4..30dd2b57be 100755
--- a/source3/script/installswat.sh
+++ b/source3/script/installswat.sh
@@ -32,7 +32,7 @@ done
 
 cat << EOF
 ======================================================================
-The SWAT files have been installed. Remember to read the web/README
+The SWAT files have been installed. Remember to read the swat/README
 for information on enabling and using SWAT
 ======================================================================
 EOF
-- 
cgit 


From 69bb6f6f5fa472d2bf5c619a09aecc3b0ce4c254 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Sun, 15 Mar 1998 00:03:38 +0000
Subject: install jpeg files (This used to be commit
 02cb3801d772cc056df3afb7028d9bd74c8553be)

---
 source3/script/installswat.sh | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'source3/script/installswat.sh')

diff --git a/source3/script/installswat.sh b/source3/script/installswat.sh
index 30dd2b57be..a51fd56272 100755
--- a/source3/script/installswat.sh
+++ b/source3/script/installswat.sh
@@ -23,6 +23,13 @@ for f in $SRCDIR../swat/images/*.gif; do
       chmod 0644 $FNAME
 done
 
+for f in $SRCDIR../swat/images/*.jpg; do
+      FNAME=$SWATDIR/images/`basename $f`
+      echo $FNAME
+      cp $f $FNAME || echo Cannot install $FNAME. Does $USER have privileges?
+      chmod 0644 $FNAME
+done
+
 for f in $SRCDIR../swat/help/*.html; do
       FNAME=$SWATDIR/help/`basename $f`
       echo $FNAME
-- 
cgit 


From 64578c0589a3a741f81fb55c16eeb882128da00b Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Wed, 29 Jul 1998 03:08:05 +0000
Subject: merge from the autoconf2 branch to the main branch (This used to be
 commit 3bda7ac417107a7b01d91805ca71c4330657ed21)

---
 source3/script/installswat.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'source3/script/installswat.sh')

diff --git a/source3/script/installswat.sh b/source3/script/installswat.sh
index a51fd56272..93f534fd72 100755
--- a/source3/script/installswat.sh
+++ b/source3/script/installswat.sh
@@ -2,7 +2,9 @@
 #fist version March 1998, Andrew Tridgell
 
 SWATDIR=$1
-SRCDIR=$2
+SRCDIR=$2/
+
+echo Installing SWAT in $SWATDIR
 
 echo Installing the Samba Web Admisistration Tool
 
-- 
cgit 


From 5ac39c2623791ca868cb95b4060392c59355627d Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Tue, 1 Sep 1998 06:03:52 +0000
Subject: need to istall new files (This used to be commit
 c53ead308e941baa4524b9ec62d74290ce91503f)

---
 source3/script/installswat.sh | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'source3/script/installswat.sh')

diff --git a/source3/script/installswat.sh b/source3/script/installswat.sh
index 93f534fd72..6bd11bcb99 100755
--- a/source3/script/installswat.sh
+++ b/source3/script/installswat.sh
@@ -8,7 +8,7 @@ echo Installing SWAT in $SWATDIR
 
 echo Installing the Samba Web Admisistration Tool
 
-for d in $SWATDIR $SWATDIR/help $SWATDIR/images; do
+for d in $SWATDIR $SWATDIR/help $SWATDIR/images $SWATDIR/include; do
 if [ ! -d $d ]; then
   mkdir $d
 if [ ! -d $d ]; then
@@ -39,6 +39,13 @@ for f in $SRCDIR../swat/help/*.html; do
       chmod 0644 $FNAME
 done
 
+for f in $SRCDIR../swat/include/*.html; do
+      FNAME=$SWATDIR/include/`basename $f`
+      echo $FNAME
+      cp $f $FNAME || echo Cannot install $FNAME. Does $USER have privileges?
+      chmod 0644 $FNAME
+done
+
 cat << EOF
 ======================================================================
 The SWAT files have been installed. Remember to read the swat/README
-- 
cgit 


From dfac41840a546801c759d385895a03e223aa5bc7 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Thu, 12 Nov 1998 23:57:18 +0000
Subject: we don't have any jpeg images any more (This used to be commit
 ae5f174ef163734c61c0d30b32f5564cfba02666)

---
 source3/script/installswat.sh | 7 -------
 1 file changed, 7 deletions(-)

(limited to 'source3/script/installswat.sh')

diff --git a/source3/script/installswat.sh b/source3/script/installswat.sh
index 6bd11bcb99..c2a1f423ad 100755
--- a/source3/script/installswat.sh
+++ b/source3/script/installswat.sh
@@ -25,13 +25,6 @@ for f in $SRCDIR../swat/images/*.gif; do
       chmod 0644 $FNAME
 done
 
-for f in $SRCDIR../swat/images/*.jpg; do
-      FNAME=$SWATDIR/images/`basename $f`
-      echo $FNAME
-      cp $f $FNAME || echo Cannot install $FNAME. Does $USER have privileges?
-      chmod 0644 $FNAME
-done
-
 for f in $SRCDIR../swat/help/*.html; do
       FNAME=$SWATDIR/help/`basename $f`
       echo $FNAME
-- 
cgit 


From 05045be470969317f51827cd9823eb9e7801cb53 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Fri, 27 Nov 1998 06:09:03 +0000
Subject: install all html docs in yodl help directory (This used to be commit
 ed4d1062b2655d59f6904344e708aa53af235ad5)

---
 source3/script/installswat.sh | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'source3/script/installswat.sh')

diff --git a/source3/script/installswat.sh b/source3/script/installswat.sh
index c2a1f423ad..cc2ab943d9 100755
--- a/source3/script/installswat.sh
+++ b/source3/script/installswat.sh
@@ -32,6 +32,13 @@ for f in $SRCDIR../swat/help/*.html; do
       chmod 0644 $FNAME
 done
 
+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
+
 for f in $SRCDIR../swat/include/*.html; do
       FNAME=$SWATDIR/include/`basename $f`
       echo $FNAME
-- 
cgit 


From 3db52feb1f3b2c07ce0b06ad4a7099fa6efe3fc7 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Mon, 13 Dec 1999 13:27:58 +0000
Subject: first pass at updating head branch to be to be the same as the
 SAMBA_2_0 branch (This used to be commit
 453a822a76780063dff23526c35408866d0c0154)

---
 source3/script/installswat.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3/script/installswat.sh')

diff --git a/source3/script/installswat.sh b/source3/script/installswat.sh
index cc2ab943d9..ab760cb545 100755
--- a/source3/script/installswat.sh
+++ b/source3/script/installswat.sh
@@ -6,7 +6,7 @@ SRCDIR=$2/
 
 echo Installing SWAT in $SWATDIR
 
-echo Installing the Samba Web Admisistration Tool
+echo Installing the Samba Web Administration Tool
 
 for d in $SWATDIR $SWATDIR/help $SWATDIR/images $SWATDIR/include; do
 if [ ! -d $d ]; then
-- 
cgit 


From 93261949f5f1f96c513d4651117ee0c462a46e63 Mon Sep 17 00:00:00 2001
From: Herb Lewis <herb@samba.org>
Date: Fri, 12 Jan 2001 21:47:01 +0000
Subject: merge from 2.0 branch for installing Using Samba book files (This
 used to be commit b04bd9ea2409ef02737fd570ce80daf167e41067)

---
 source3/script/installswat.sh | 76 ++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 68 insertions(+), 8 deletions(-)

(limited to 'source3/script/installswat.sh')

diff --git a/source3/script/installswat.sh b/source3/script/installswat.sh
index ab760cb545..8afbc52eba 100755
--- a/source3/script/installswat.sh
+++ b/source3/script/installswat.sh
@@ -3,21 +3,23 @@
 
 SWATDIR=$1
 SRCDIR=$2/
+BOOKDIR=$3
 
 echo Installing SWAT in $SWATDIR
-
 echo Installing the Samba Web Administration Tool
 
 for d in $SWATDIR $SWATDIR/help $SWATDIR/images $SWATDIR/include; 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
+    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
 
+# Install images
+
 for f in $SRCDIR../swat/images/*.gif; do
       FNAME=$SWATDIR/images/`basename $f`
       echo $FNAME
@@ -25,13 +27,24 @@ for f in $SRCDIR../swat/images/*.gif; do
       chmod 0644 $FNAME
 done
 
+# Install html help
+
 for f in $SRCDIR../swat/help/*.html; do
       FNAME=$SWATDIR/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
@@ -39,6 +52,8 @@ for f in $SRCDIR../docs/htmldocs/*.html; do
       chmod 0644 $FNAME
 done
 
+# Install "server-side" includes
+
 for f in $SRCDIR../swat/include/*.html; do
       FNAME=$SWATDIR/include/`basename $f`
       echo $FNAME
@@ -46,6 +61,51 @@ for f in $SRCDIR../swat/include/*.html; do
       chmod 0644 $FNAME
 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
+    done
+
+fi
+
 cat << EOF
 ======================================================================
 The SWAT files have been installed. Remember to read the swat/README
-- 
cgit 


From 6056766247fc2e7206d6bb13ad1ac467663ac298 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Mon, 7 May 2001 03:55:54 +0000
Subject: merge some fixes from 2.2 (This used to be commit
 7e57adf2a039cb5b6458496f9190c9c642645600)

---
 source3/script/installswat.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3/script/installswat.sh')

diff --git a/source3/script/installswat.sh b/source3/script/installswat.sh
index 8afbc52eba..8868d4cbb1 100755
--- a/source3/script/installswat.sh
+++ b/source3/script/installswat.sh
@@ -3,7 +3,7 @@
 
 SWATDIR=$1
 SRCDIR=$2/
-BOOKDIR=$3
+BOOKDIR=$SWATDIR/using_samba
 
 echo Installing SWAT in $SWATDIR
 echo Installing the Samba Web Administration Tool
-- 
cgit 


From 1817c231c7e67bf836fc1b08fda9b1d8f322f6b8 Mon Sep 17 00:00:00 2001
From: Motonobu Takahashi <monyo@samba.org>
Date: Tue, 25 Sep 2001 17:40:12 +0000
Subject: now --with-i18n-swat works to install some international files used
 by SWAT into $swatdir/$ln/{help,images,include}

we have still points which needs to discuss, that is how to archive
and install lots of HTML help files and Using Samba files.

-- monyo
(This used to be commit 9ec2d5e96ebb907e66250772057bf5e2601f8ec9)
---
 source3/script/installswat.sh | 34 ++++++++++++++++++++++++++--------
 1 file changed, 26 insertions(+), 8 deletions(-)

(limited to 'source3/script/installswat.sh')

diff --git a/source3/script/installswat.sh b/source3/script/installswat.sh
index 8868d4cbb1..fce4406b83 100755
--- a/source3/script/installswat.sh
+++ b/source3/script/installswat.sh
@@ -4,13 +4,26 @@
 SWATDIR=$1
 SRCDIR=$2/
 BOOKDIR=$SWATDIR/using_samba
+IS_I18N=$3
 
 echo Installing SWAT in $SWATDIR
 echo Installing the Samba Web Administration Tool
 
-for d in $SWATDIR $SWATDIR/help $SWATDIR/images $SWATDIR/include; do
+if [ X$IS_I18N = Xyes ]; then
+    LANGS=". `cd $SRCDIR../swat/; /bin/echo lang/??`"
+    echo Installing langs are `cd $SRCDIR../swat/lang/; /bin/echo ??`
+else
+    LANGS=.
+fi
+
+for ln in $LANGS; do 
+
+SWATLANGDIR=$SWATDIR/$ln
+
+for d in $SWATLANGDIR $SWATLANGDIR/help $SWATLANGDIR/images \
+	$SWATLANGDIR/include; do
     if [ ! -d $d ]; then
-	mkdir $d
+	mkdir -p $d
 	if [ ! -d $d ]; then
 	    echo Failed to make directory $d, does $USER have privileges?
 	    exit 1
@@ -18,10 +31,13 @@ for d in $SWATDIR $SWATDIR/help $SWATDIR/images $SWATDIR/include; do
     fi
 done
 
+done
+
 # Install images
+for ln in $LANGS; do
 
-for f in $SRCDIR../swat/images/*.gif; do
-      FNAME=$SWATDIR/images/`basename $f`
+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
@@ -29,8 +45,8 @@ done
 
 # Install html help
 
-for f in $SRCDIR../swat/help/*.html; do
-      FNAME=$SWATDIR/help/`basename $f`
+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
@@ -54,13 +70,15 @@ done
 
 # Install "server-side" includes
 
-for f in $SRCDIR../swat/include/*.html; do
-      FNAME=$SWATDIR/include/`basename $f`
+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
-- 
cgit 


From 59efa068bd3d2f920a40b3333d09a22beb8dedb3 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Mon, 15 Oct 2001 05:15:31 +0000
Subject: always install swat language files (This used to be commit
 f283011c284844ef1bdd1f1fc718263904ef5797)

---
 source3/script/installswat.sh | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

(limited to 'source3/script/installswat.sh')

diff --git a/source3/script/installswat.sh b/source3/script/installswat.sh
index fce4406b83..c66604cdb8 100755
--- a/source3/script/installswat.sh
+++ b/source3/script/installswat.sh
@@ -4,23 +4,16 @@
 SWATDIR=$1
 SRCDIR=$2/
 BOOKDIR=$SWATDIR/using_samba
-IS_I18N=$3
 
 echo Installing SWAT in $SWATDIR
 echo Installing the Samba Web Administration Tool
 
-if [ X$IS_I18N = Xyes ]; then
-    LANGS=". `cd $SRCDIR../swat/; /bin/echo lang/??`"
-    echo Installing langs are `cd $SRCDIR../swat/lang/; /bin/echo ??`
-else
-    LANGS=.
-fi
+LANGS=". `cd $SRCDIR../swat/; /bin/echo lang/??`"
+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=$SWATDIR/$ln
+ for d in $SWATLANGDIR $SWATLANGDIR/help $SWATLANGDIR/images \
 	$SWATLANGDIR/include; do
     if [ ! -d $d ]; then
 	mkdir -p $d
@@ -29,8 +22,7 @@ for d in $SWATLANGDIR $SWATLANGDIR/help $SWATLANGDIR/images \
 	    exit 1
 	fi
     fi
-done
-
+ done
 done
 
 # Install images
-- 
cgit 


From 858137d0dd8672f25e4bfe21ce79ff280bd2457b Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 21 Apr 2003 01:04:17 +0000
Subject: - Fix modules build of pdb_mysql and pdb_xml - Fix typo in
 script/installswat.sh (This used to be commit
 8d2aec7a73d41a9d32c10abd1c8833ebfd41dd77)

---
 source3/script/installswat.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3/script/installswat.sh')

diff --git a/source3/script/installswat.sh b/source3/script/installswat.sh
index c66604cdb8..d1f8ea191d 100755
--- a/source3/script/installswat.sh
+++ b/source3/script/installswat.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-#fist version March 1998, Andrew Tridgell
+#first version March 1998, Andrew Tridgell
 
 SWATDIR=$1
 SRCDIR=$2/
-- 
cgit 


From a1be0fbbb4191cfd9ebc2eaab2f02bda02adf14b Mon Sep 17 00:00:00 2001
From: Gerald Carter <jerry@samba.org>
Date: Fri, 22 Aug 2003 16:23:56 +0000
Subject: don't complain if the using_samba book is not in the tree (This used
 to be commit 20603faf2c6e37b1db139cdbbfd4131cb5c33869)

---
 source3/script/installswat.sh | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

(limited to 'source3/script/installswat.sh')

diff --git a/source3/script/installswat.sh b/source3/script/installswat.sh
index d1f8ea191d..300324b077 100755
--- a/source3/script/installswat.sh
+++ b/source3/script/installswat.sh
@@ -71,13 +71,13 @@ done
 
 done
 
-# Install Using Samba book
+# Install Using Samba book (but only if it is there)
 
-if [ "x$BOOKDIR" != "x" ]; then
+if [ "x$BOOKDIR" != "x" -a -f $SRCDIR../docs/htmldocs/using_samba/toc.html ]; then
 
     # Create directories
 
-    for d in $BOOKDIR $BOOKDIR/figs $BOOKDIR/gifs; do
+    for d in $BOOKDIR $BOOKDIR/figs ; do
         if [ ! -d $d ]; then
             mkdir $d
             if [ ! -d $d ]; then
@@ -105,15 +105,6 @@ if [ "x$BOOKDIR" != "x" ]; then
         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
-    done
-
 fi
 
 cat << EOF
-- 
cgit 


From 9809c98f24b53e6b34d80bd7abcf439f4c0e6ec6 Mon Sep 17 00:00:00 2001
From: Gerald Carter <jerry@samba.org>
Date: Thu, 28 Aug 2003 21:23:04 +0000
Subject: make sure using_samba 2ed. files get installed ok (This used to be
 commit 55b6129bd106898ebfe976facacfe1d079492993)

---
 source3/script/installswat.sh | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'source3/script/installswat.sh')

diff --git a/source3/script/installswat.sh b/source3/script/installswat.sh
index 300324b077..bd2f8da234 100755
--- a/source3/script/installswat.sh
+++ b/source3/script/installswat.sh
@@ -96,6 +96,13 @@ if [ "x$BOOKDIR" != "x" -a -f $SRCDIR../docs/htmldocs/using_samba/toc.html ]; th
         chmod 0644 $FNAME
     done
 
+    for f in $SRCDIR../docs/htmldocs/using_samba/*.gif; 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
-- 
cgit 


From 629120a0a1ee0726cf6f43bf841ca042d2b0229e Mon Sep 17 00:00:00 2001
From: Gerald Carter <jerry@samba.org>
Date: Mon, 6 Oct 2003 19:24:17 +0000
Subject: cosmetic fix when DESTDIR=/ (default) (This used to be commit
 e660b5752aa129c49b0b665845de2fe4c160be00)

---
 source3/script/installswat.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3/script/installswat.sh')

diff --git a/source3/script/installswat.sh b/source3/script/installswat.sh
index bd2f8da234..7841a2a7b5 100755
--- a/source3/script/installswat.sh
+++ b/source3/script/installswat.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 #first version March 1998, Andrew Tridgell
 
-SWATDIR=$1
+SWATDIR=`echo $1 | sed 's/\/\//\//g'`
 SRCDIR=$2/
 BOOKDIR=$SWATDIR/using_samba
 
-- 
cgit 


From 6ebde91c44402f830b5887f11037b6fa625c16bc Mon Sep 17 00:00:00 2001
From: Gerald Carter <jerry@samba.org>
Date: Fri, 7 Nov 2003 23:04:06 +0000
Subject: * only install swat html files once * revert the change that prevent
 the guest   account from being added to a passdb backend   since it broke the
 build farm. * apply patch from Alex Deiter to fix the   "smbldap_open: cannot
 access when not root   error" messages when looking up group   information
 (bug 281) (This used to be commit 9b8bf6a950186bd95abe952af4a7d35829b34ff8)

---
 source3/script/installswat.sh | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

(limited to 'source3/script/installswat.sh')

diff --git a/source3/script/installswat.sh b/source3/script/installswat.sh
index 7841a2a7b5..be0cdf3eef 100755
--- a/source3/script/installswat.sh
+++ b/source3/script/installswat.sh
@@ -28,16 +28,16 @@ done
 # Install images
 for ln in $LANGS; do
 
-for f in $SRCDIR../swat/$ln/images/*.gif; 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
+  done
 
-# Install html help
+  # Install html help
 
-for f in $SRCDIR../swat/$ln/help/*.html; do
+  for f in $SRCDIR../swat/$ln/help/*.html; do
       FNAME=$SWATDIR/$ln/help/`basename $f`
       echo $FNAME
       if [ "x$BOOKDIR" = "x" ]; then
@@ -49,28 +49,28 @@ for f in $SRCDIR../swat/$ln/help/*.html; do
       cp $f $FNAME || echo Cannot install $FNAME. Does $USER have privileges?
       rm -f $f
       chmod 0644 $FNAME
-done
+  done
 
-# Install html documentation
+  # Install "server-side" includes
 
-for f in $SRCDIR../docs/htmldocs/*.html; do
-      FNAME=$SWATDIR/help/`basename $f`
+  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 "server-side" includes
+# Install html documentation
 
-for f in $SRCDIR../swat/$ln/include/*.html; do
-      FNAME=$SWATDIR/$ln/include/`basename $f`
+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
 
-done
-
 # Install Using Samba book (but only if it is there)
 
 if [ "x$BOOKDIR" != "x" -a -f $SRCDIR../docs/htmldocs/using_samba/toc.html ]; then
-- 
cgit 


From daea4804c3fcfa18ec95b3979ad7f7970a273642 Mon Sep 17 00:00:00 2001
From: Rafal Szczesniak <mimir@samba.org>
Date: Wed, 12 Nov 2003 13:02:25 +0000
Subject: Omit html documentation tree because it has been moved to the
 separate module. Install though, in case one recreates the tree as it was
 before.

rafal
(This used to be commit d6857d191ca5aa24f791880e517b0e8db3d587eb)
---
 source3/script/installswat.sh | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

(limited to 'source3/script/installswat.sh')

diff --git a/source3/script/installswat.sh b/source3/script/installswat.sh
index be0cdf3eef..7ac675de10 100755
--- a/source3/script/installswat.sh
+++ b/source3/script/installswat.sh
@@ -62,14 +62,17 @@ for ln in $LANGS; do
 
 done
 
-# Install html documentation
+# Install html documentation (if html documentation tree is here)
 
-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
+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
+    done
+fi
 
 # Install Using Samba book (but only if it is there)
 
-- 
cgit 


From 5c8b533638f5a438928d5e4d3d0122d82762cdf3 Mon Sep 17 00:00:00 2001
From: Gerald Carter <jerry@samba.org>
Date: Wed, 10 Dec 2003 14:10:26 +0000
Subject: patch from TAKEDA yasuma to bypass any missing language files (This
 used to be commit a3b0cc9f5b230cc4b9a017c9566b2ef83fb54030)

---
 source3/script/installswat.sh | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'source3/script/installswat.sh')

diff --git a/source3/script/installswat.sh b/source3/script/installswat.sh
index 7ac675de10..c0285bda55 100755
--- a/source3/script/installswat.sh
+++ b/source3/script/installswat.sh
@@ -29,6 +29,9 @@ done
 for ln in $LANGS; do
 
   for f in $SRCDIR../swat/$ln/images/*.gif; do
+      if [ ! -f $f ] ; then
+	continue
+      fi
       FNAME=$SWATDIR/$ln/images/`basename $f`
       echo $FNAME
       cp $f $FNAME || echo Cannot install $FNAME. Does $USER have privileges?
@@ -38,6 +41,9 @@ for ln in $LANGS; do
   # Install html help
 
   for f in $SRCDIR../swat/$ln/help/*.html; do
+      if [ ! -f $f ] ; then
+	continue
+      fi
       FNAME=$SWATDIR/$ln/help/`basename $f`
       echo $FNAME
       if [ "x$BOOKDIR" = "x" ]; then
@@ -54,6 +60,9 @@ for ln in $LANGS; do
   # Install "server-side" includes
 
   for f in $SRCDIR../swat/$ln/include/*.html; do
+      if [ ! -f $f ] ; then
+	continue
+      fi
       FNAME=$SWATDIR/$ln/include/`basename $f`
       echo $FNAME
       cp $f $FNAME || echo Cannot install $FNAME. Does $USER have privileges?
-- 
cgit 


From 08d03a703957b90d194819799597ea87e2913a57 Mon Sep 17 00:00:00 2001
From: Gerald Carter <jerry@samba.org>
Date: Tue, 2 Mar 2004 18:10:12 +0000
Subject: BUG 1129: patch from shiro@miraclelinux.com (Shiro Yamada) to install
 image files for SWAT (This used to be commit
 a01a7fdbd93997185322d1faaa76c408f0ed2b1d)

---
 source3/script/installswat.sh | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

(limited to 'source3/script/installswat.sh')

diff --git a/source3/script/installswat.sh b/source3/script/installswat.sh
index c0285bda55..495386e0b7 100755
--- a/source3/script/installswat.sh
+++ b/source3/script/installswat.sh
@@ -81,6 +81,22 @@ if [ -d $SRCDIR../docs/htmldocs/ ]; then
 	cp $f $FNAME || echo Cannot install $FNAME. Does $USER have privileges?
 	chmod 0644 $FNAME
     done
+
+    if [ -d $SRCDIR../docs/htmldocs/images/ ]; then
+        if [ ! -d $SWATDIR/help/images/ ]; then
+            mkdir $SWATDIR/help/images
+            if [ ! -d $SWATDIR/help/images/ ]; then
+                echo Failed to make directory $SWATDIR/help/images, does $USER have privileges?
+                exit 1
+            fi
+        fi
+        for f in $SRCDIR../docs/htmldocs/images/*.png; do
+            FNAME=$SWATDIR/help/images/`basename $f`
+            echo $FNAME
+            cp $f $FNAME || echo Cannot install $FNAME. Does $USER have privileges?
+            chmod 0644 $FNAME
+        done
+    fi
 fi
 
 # Install Using Samba book (but only if it is there)
-- 
cgit 


From 4f9c8e28ac43bf3c64f3edbadf7051fc9091624a Mon Sep 17 00:00:00 2001
From: Gerald Carter <jerry@samba.org>
Date: Wed, 5 May 2004 15:52:11 +0000
Subject: r496: fixing swat welcome page -- added links to example guide, devel
 guide, and howto (all in multi page format) (This used to be commit
 984d9fe271a86da696cedb81aa9de46c5716bba3)

---
 source3/script/installswat.sh | 55 ++++++++++++++++++++++++++-----------------
 1 file changed, 34 insertions(+), 21 deletions(-)

(limited to 'source3/script/installswat.sh')

diff --git a/source3/script/installswat.sh b/source3/script/installswat.sh
index 495386e0b7..67586a8967 100755
--- a/source3/script/installswat.sh
+++ b/source3/script/installswat.sh
@@ -75,28 +75,41 @@ done
 
 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
-    done
+    for dir in htmldocs/ htmldocs/howto htmldocs/guide htmldocs/devel
+    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
 
-    if [ -d $SRCDIR../docs/htmldocs/images/ ]; then
-        if [ ! -d $SWATDIR/help/images/ ]; then
-            mkdir $SWATDIR/help/images
-            if [ ! -d $SWATDIR/help/images/ ]; then
-                echo Failed to make directory $SWATDIR/help/images, does $USER have privileges?
-                exit 1
-            fi
-        fi
-        for f in $SRCDIR../docs/htmldocs/images/*.png; do
-            FNAME=$SWATDIR/help/images/`basename $f`
-            echo $FNAME
-            cp $f $FNAME || echo Cannot install $FNAME. Does $USER have privileges?
-            chmod 0644 $FNAME
-        done
-    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/`basename $f`
+              echo $FNAME
+              cp $f $FNAME || echo Cannot install $FNAME. Does $USER have privileges?
+              chmod 0644 $FNAME
+          done
+      fi
+    done
 fi
 
 # Install Using Samba book (but only if it is there)
-- 
cgit 


From c1a0b0a9e7ce57bdb0e5341f8d272bc02a4b6e84 Mon Sep 17 00:00:00 2001
From: Gerald Carter <jerry@samba.org>
Date: Thu, 8 Jul 2004 19:44:41 +0000
Subject: r1410: fix another bug caused by the docs target directories change
 (This used to be commit e13d15994d93b0b17ea4f547cc6e279c3509a7d0)

---
 source3/script/installswat.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3/script/installswat.sh')

diff --git a/source3/script/installswat.sh b/source3/script/installswat.sh
index 67586a8967..9e3ab689b4 100755
--- a/source3/script/installswat.sh
+++ b/source3/script/installswat.sh
@@ -75,7 +75,7 @@ done
 
 if [ -d $SRCDIR../docs/htmldocs/ ]; then
 
-    for dir in htmldocs/ htmldocs/howto htmldocs/guide htmldocs/devel
+    for dir in htmldocs/ htmldocs/Samba-HOWTO-Collection htmldocs/Samba-Guide htmldocs/Samba-Developers-Guide
     do 
     
       if [ ! -d $SRCDIR../docs/$dir ]; then
-- 
cgit 


From 07d8bf0f8fc29c2666edeeec03a7028f219f3e6d Mon Sep 17 00:00:00 2001
From: Gerald Carter <jerry@samba.org>
Date: Tue, 23 Nov 2004 15:27:53 +0000
Subject: r3924: fix installswat once again after the image target location had
 changed in the docs (This used to be commit
 ddb5823ac23b8d61c29d73f4f5bae1c3a319a1f4)

---
 source3/script/installswat.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3/script/installswat.sh')

diff --git a/source3/script/installswat.sh b/source3/script/installswat.sh
index 9e3ab689b4..6b66f6f23e 100755
--- a/source3/script/installswat.sh
+++ b/source3/script/installswat.sh
@@ -103,7 +103,7 @@ if [ -d $SRCDIR../docs/htmldocs/ ]; then
               fi
           fi
           for f in $SRCDIR../docs/$dir/images/*.png; do
-              FNAME=$INSTALLDIR/`basename $f`
+              FNAME=$INSTALLDIR/images/`basename $f`
               echo $FNAME
               cp $f $FNAME || echo Cannot install $FNAME. Does $USER have privileges?
               chmod 0644 $FNAME
-- 
cgit 


From 0b8bc68b50e1cf75686563375bd63c38aba197cb Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Mon, 20 Jun 2005 21:20:47 +0000
Subject: r7788: Update install swat message to reflect the fact that
 swat/README no longer exists.  Bugzilla #2808. (This used to be commit
 88a3faf84eb74a2a8c5a100170f82102c74e9939)

---
 source3/script/installswat.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3/script/installswat.sh')

diff --git a/source3/script/installswat.sh b/source3/script/installswat.sh
index 6b66f6f23e..53c268a95a 100755
--- a/source3/script/installswat.sh
+++ b/source3/script/installswat.sh
@@ -157,7 +157,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
-- 
cgit 


From 9451a51b59a71b87c3a2afb9cbc3812a7a578a9a Mon Sep 17 00:00:00 2001
From: Gerald Carter <jerry@samba.org>
Date: Thu, 28 Jul 2005 17:28:20 +0000
Subject: r8834: fixing SWAT install after docs changeswat/help/welcome.html
 (This used to be commit 6fb371f0c87379a9812ff0cad30c739df171a462)

---
 source3/script/installswat.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'source3/script/installswat.sh')

diff --git a/source3/script/installswat.sh b/source3/script/installswat.sh
index 53c268a95a..2b99b9c57f 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
@@ -75,7 +75,7 @@ done
 
 if [ -d $SRCDIR../docs/htmldocs/ ]; then
 
-    for dir in htmldocs/ htmldocs/Samba-HOWTO-Collection htmldocs/Samba-Guide htmldocs/Samba-Developers-Guide
+    for dir in htmldocs/manpages  htmldocs/Samba3-ByExample  htmldocs/Samba3-Developers-Guide  htmldocs/Samba3-HOWTO  
     do 
     
       if [ ! -d $SRCDIR../docs/$dir ]; then
-- 
cgit 


From 54abd2aa66069e6baf7769c496f46d9dba18db39 Mon Sep 17 00:00:00 2001
From: Gerald Carter <jerry@samba.org>
Date: Fri, 30 Sep 2005 17:13:37 +0000
Subject: r10656: BIG merge from trunk.  Features not copied over

* \PIPE\unixinfo
* winbindd's {group,alias}membership new functions
* winbindd's lookupsids() functionality
* swat (trunk changes to be reverted as per discussion with Deryck)
(This used to be commit 939c3cb5d78e3a2236209b296aa8aba8bdce32d3)
---
 source3/script/installswat.sh | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

(limited to 'source3/script/installswat.sh')

diff --git a/source3/script/installswat.sh b/source3/script/installswat.sh
index 2b99b9c57f..cba3a294f8 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/help/using_samba
+BOOKDIR=$SWATDIR/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; 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,13 +69,25 @@ 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 dir in htmldocs/manpages  htmldocs/Samba3-ByExample  htmldocs/Samba3-Developers-Guide  htmldocs/Samba3-HOWTO  
+    for dir in htmldocs/ htmldocs/Samba-HOWTO-Collection htmldocs/Samba-Guide htmldocs/Samba-Developers-Guide
     do 
     
       if [ ! -d $SRCDIR../docs/$dir ]; then
-- 
cgit 


From 63937fec90338fb5affe2d8cb2a568edae320acd Mon Sep 17 00:00:00 2001
From: Gerald Carter <jerry@samba.org>
Date: Tue, 18 Oct 2005 17:20:50 +0000
Subject: r11152: fix some regressions caused by the trunk->3.0 merge when
 install docs with SWAT (This used to be commit
 e3c68738663701fde21baef03c36de303e7f1636)

---
 source3/script/installswat.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3/script/installswat.sh')

diff --git a/source3/script/installswat.sh b/source3/script/installswat.sh
index cba3a294f8..c5c285894e 100755
--- a/source3/script/installswat.sh
+++ b/source3/script/installswat.sh
@@ -87,7 +87,7 @@ done
 
 if [ -d $SRCDIR../docs/htmldocs/ ]; then
 
-    for dir in htmldocs/ htmldocs/Samba-HOWTO-Collection htmldocs/Samba-Guide htmldocs/Samba-Developers-Guide
+    for dir in htmldocs/manpages htmldocs/Samba3-ByExample  htmldocs/Samba3-Developers-Guide  htmldocs/Samba3-HOWTO
     do 
     
       if [ ! -d $SRCDIR../docs/$dir ]; then
-- 
cgit 


From 67e8af8527d08d97736f9d1468d4ccd582940f44 Mon Sep 17 00:00:00 2001
From: Gerald Carter <jerry@samba.org>
Date: Tue, 20 Dec 2005 02:23:51 +0000
Subject: r12393: cleaning up swat bugs.  *no one* tests swat it seems.  This
 has been broken since r10656 (This used to be commit
 85ea7afd8bd30e0a2bcbc7181f75fde63b016a34)

---
 source3/script/installswat.sh | 20 ++++----------------
 1 file changed, 4 insertions(+), 16 deletions(-)

(limited to 'source3/script/installswat.sh')

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)
-- 
cgit 


From 0af1500fc0bafe61019f1b2ab1d9e1d369221240 Mon Sep 17 00:00:00 2001
From: Gerald Carter <jerry@samba.org>
Date: Fri, 3 Feb 2006 22:19:41 +0000
Subject: r13316: Let the carnage begin.... Sync with trunk as off r13315 (This
 used to be commit 17e63ac4ed8325c0d44fe62b2442449f3298559f)

---
 source3/script/installswat.sh | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

(limited to 'source3/script/installswat.sh')

diff --git a/source3/script/installswat.sh b/source3/script/installswat.sh
index c66fd29485..c5c285894e 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/help/using_samba
+BOOKDIR=$SWATDIR/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; 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,6 +69,18 @@ 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)
-- 
cgit 


From 9169edfeb4ea4358dbaf948372847542fb57464e Mon Sep 17 00:00:00 2001
From: Lars Müller <lmuelle@samba.org>
Date: Fri, 24 Feb 2006 00:30:09 +0000
Subject: r13663: make uninstall DESTDIR=/somewhere no longer leaves files. 
 This is done with the new rules: uninstallservers uninstalldat, uninstallswat
 (calles uninstallmsg), uninstallmodules, uninstallclientlib, and
 uninstalllibmsrpc.

We still leave directories.  We might try to remove the dirs we created
in reverse order.

The new uninstall scripts are sym links to the respective install
scripts.  Inside we set mode to install or uninstall.

installservers is now used to install the servers.  These are no longer
installed with installbin.
(This used to be commit 43549301b937c060742840054017b31bf3781e04)
---
 source3/script/installswat.sh | 271 +++++++++++++++++++++++++++++++-----------
 1 file changed, 204 insertions(+), 67 deletions(-)

(limited to 'source3/script/installswat.sh')

diff --git a/source3/script/installswat.sh b/source3/script/installswat.sh
index c5c285894e..095ccb897b 100755
--- a/source3/script/installswat.sh
+++ b/source3/script/installswat.sh
@@ -1,89 +1,152 @@
 #!/bin/sh
 #first version March 1998, Andrew Tridgell
 
-SWATDIR=`echo $1 | sed 's/\/\//\//g'`
-SRCDIR=$2/
-BOOKDIR=$SWATDIR/using_samba
+DESTDIR=$1
+SWATDIR=`echo $2 | sed 's/\/\//\//g'`
+SRCDIR=$3/
+BOOKDIR="$DESTDIR/$SWATDIR/using_samba"
 
-echo Installing SWAT in $SWATDIR
-echo Installing the Samba Web Administration Tool
+case $0 in
+	*uninstall*)
+		echo "Removing SWAT from $DESTDIR/$SWATDIR "
+		echo "Removing the Samba Web Administration Tool "
+		echo -n "Removed "
+		mode='uninstall'
+		;;
+	*)
+		echo "Installing SWAT in $DESTDIR/$SWATDIR "
+		echo "Installing the Samba Web Administration Tool "
+		echo -n "Installing "
+		mode='install'
+		;;
+esac
 
 LANGS=". `cd $SRCDIR../swat/; /bin/echo lang/??`"
-echo Installing langs are `cd $SRCDIR../swat/lang/; /bin/echo ??`
+echo "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
+if test "$mode" = 'install'; then
+ for ln in $LANGS; do 
+  SWATLANGDIR="$DESTDIR/$SWATDIR/$ln"
+  for d in $SWATLANGDIR $SWATLANGDIR/help $SWATLANGDIR/images \
+  $SWATLANGDIR/include $SWATLANGDIR/js; do
+   if [ ! -d $d ]; then
+    mkdir -p $d
     if [ ! -d $d ]; then
-	mkdir -p $d
-	if [ ! -d $d ]; then
-	    echo Failed to make directory $d, does $USER have privileges?
-	    exit 1
-	fi
+     echo "Failed to make directory $d, does $USER have privileges? "
+     exit 1
     fi
+   fi
+  done
  done
-done
+fi
 
-# Install images
 for ln in $LANGS; do
 
+  # images
   for f in $SRCDIR../swat/$ln/images/*.png; do
-      if [ ! -f $f ] ; then
-	continue
+    if [ ! -f $f ] ; then
+      continue
+    fi
+    FNAME="$DESTDIR/$SWATDIR/$ln/images/`basename $f`"
+    echo $FNAME
+    if test "$mode" = 'install'; then
+      cp "$f" "$FNAME"
+      if test ! -e "$FNAME"; then
+        echo "Cannot install $FNAME. Does $USER have privileges? "
+        exit 1
       fi
-      FNAME=$SWATDIR/$ln/images/`basename $f`
-      echo $FNAME
-      cp $f $FNAME || echo Cannot install $FNAME. Does $USER have privileges?
-      chmod 0644 $FNAME
+      chmod 0644 "$FNAME"
+    elif test "$mode" = 'uninstall'; then
+      rm -f "$FNAME"
+      if test -e "$FNAME"; then
+        echo "Cannot remove $FNAME.  Does $USER have privileges? "
+        exit 1
+      fi
+    else
+      echo "Unknown mode, $mode.  Script called as $0 "
+      exit 1
+    fi
   done
 
-  # Install html help
-
+  # html help
   for f in $SRCDIR../swat/$ln/help/*.html; do
-      if [ ! -f $f ] ; then
-	continue
-      fi
-      FNAME=$SWATDIR/$ln/help/`basename $f`
-      echo $FNAME
+    if [ ! -f $f ] ; then
+      continue
+    fi
+    FNAME="$DESTDIR/$SWATDIR/$ln/help/`basename $f`"
+    echo $FNAME
+    if test "$mode" = 'install'; then
       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
+      cp "$f" "$FNAME"
+      rm -f "$f"
+      if test ! -e "$FNAME"; then
+        echo "Cannot install $FNAME. Does $USER have privileges? "
+        exit 1
+      fi
+      chmod 0644 "$FNAME"
+    elif test "$mode" = 'uninstall'; then
+      rm -f "$FNAME"
+      if test -e "$FNAME"; then
+        echo "Cannot remove $FNAME.  Does $USER have privileges? "
+        exit 1
+      fi
+    fi
   done
 
-  # Install "server-side" includes
-
+  # "server-side" includes
   for f in $SRCDIR../swat/$ln/include/*; do
       if [ ! -f $f ] ; then
 	continue
       fi
-      FNAME=$SWATDIR/$ln/include/`basename $f`
+      FNAME="$DESTDIR/$SWATDIR/$ln/include/`basename $f`"
       echo $FNAME
-      cp $f $FNAME || echo Cannot install $FNAME. Does $USER have privileges?
-      chmod 0644 $FNAME
+      if test "$mode" = 'install'; then
+        cp "$f" "$FNAME"
+        if test ! -e "$FNAME"; then
+          echo "Cannot install $FNAME. Does $USER have privileges? "
+          exit 1
+        fi
+        chmod 0644 $FNAME
+      elif test "$mode" = 'uninstall'; then
+        rm -f "$FNAME"
+        if test -e "$FNAME"; then
+          echo "Cannot remove $FNAME.  Does $USER have privileges? "
+          exit 1
+        fi
+      fi
   done
 
-  # Install javascripts
-
+  # javascripts
   for f in $SRCDIR../swat/$ln/js/*.js; do
       if [ ! -f $f ] ; then
 	continue
       fi
-      FNAME=$SWATDIR/$ln/js/`basename $f`
+      FNAME="$DESTDIR/$SWATDIR/$ln/js/`basename $f`"
       echo $FNAME
-      cp $f $FNAME || echo Cannot install $FNAME. Does $USER have privileges?
-      chmod 0644 $FNAME
+      if test "$mode" = 'install'; then
+        cp "$f" "$FNAME"
+        if test ! -e "$FNAME"; then
+          echo "Cannot install $FNAME. Does $USER have privileges? "
+          exit 1
+        fi
+        chmod 0644 $FNAME
+      elif test "$mode" = 'uninstall'; then
+        rm -f "$FNAME"
+        if test -e "$FNAME"; then
+          echo "Cannot remove $FNAME.  Does $USER have privileges? "
+          exit 1
+        fi
+      fi
   done
 
 done
 
-# Install html documentation (if html documentation tree is here)
+# Install/ remove html documentation (if html documentation tree is here)
 
 if [ -d $SRCDIR../docs/htmldocs/ ]; then
 
@@ -94,47 +157,75 @@ if [ -d $SRCDIR../docs/htmldocs/ ]; then
         continue
       fi
       
-      INSTALLDIR=$SWATDIR/help/`echo $dir | sed 's/htmldocs\///g'`
-      if [ ! -d $INSTALLDIR ]; then
-        mkdir $INSTALLDIR
+      INSTALLDIR="$DESTDIR/$SWATDIR/help/`echo $dir | sed 's/htmldocs\///g'`"
+      if test ! -d "$INSTALLDIR" -a "$mode" = 'install'; then
+        mkdir "$INSTALLDIR"
+        if test ! -d "$INSTALLDIR"; then
+          echo "Failed to make directory $INSTALLDIR, does $USER have privileges? "
+          exit 1
+        fi
       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
+          if test "$mode" = 'install'; then
+            cp "$f" "$FNAME"
+            if test ! -e "$FNAME"; then
+              echo "Cannot install $FNAME. Does $USER have privileges? "
+              exit 1
+            fi
+            chmod 0644 $FNAME
+          elif test "$mode" = 'uninstall'; then
+            rm -f "$FNAME"
+            if test -e "$FNAME"; then
+              echo "Cannot remove $FNAME.  Does $USER have privileges? "
+              exit 1
+            fi
+          fi
       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?
+      if test -d "$SRCDIR../docs/$dir/images/"; then
+          if test ! -d "$INSTALLDIR/images/" -a "$mode" = 'install'; then
+              mkdir "$INSTALLDIR/images"
+              if test ! -d "$INSTALLDIR/images/"; then
+                  echo "Failed to make directory $INSTALLDIR/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
+              if test "$mode" = 'install'; then
+                cp "$f" "$FNAME"
+                if test ! -e "$FNAME"; then
+                  echo "Cannot install $FNAME. Does $USER have privileges? "
+                  exit 1
+                fi
+                chmod 0644 $FNAME
+              elif test "$mode" = 'uninstall'; then
+                rm -f "$FNAME"
+                if test -e "$FNAME"; then
+                  echo "Cannot remove $FNAME.  Does $USER have privileges? "
+                  exit 1
+                fi
+              fi
           done
       fi
     done
 fi
 
-# Install Using Samba book (but only if it is there)
+# Install/ remove Using Samba book (but only if it is there)
 
 if [ "x$BOOKDIR" != "x" -a -f $SRCDIR../docs/htmldocs/using_samba/toc.html ]; then
 
     # Create directories
 
     for d in $BOOKDIR $BOOKDIR/figs ; do
-        if [ ! -d $d ]; then
+        if test ! -d "$d" -a "$mode" = 'install'; then
             mkdir $d
-            if [ ! -d $d ]; then
-                echo Failed to make directory $d, does $USER have privileges?
+            if test ! -d "$d"; then
+                echo "Failed to make directory $d, does $USER have privileges? "
                 exit 1
             fi
         fi
@@ -145,15 +236,39 @@ if [ "x$BOOKDIR" != "x" -a -f $SRCDIR../docs/htmldocs/using_samba/toc.html ]; th
     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
+        if test "$mode" = 'install'; then
+          cp "$f" "$FNAME"
+          if test ! -e "$FNAME"; then
+            echo "Cannot install $FNAME. Does $USER have privileges? "
+            exit 1
+          fi
+          chmod 0644 $FNAME
+        elif test "$mode" = 'uninstall'; then
+          rm -f "$FNAME"
+          if test -e "$FNAME"; then
+            echo "Cannot remove $FNAME.  Does $USER have privileges? "
+            exit 1
+          fi
+        fi
     done
 
     for f in $SRCDIR../docs/htmldocs/using_samba/*.gif; do
         FNAME=$BOOKDIR/`basename $f`
         echo $FNAME
-        cp $f $FNAME || echo Cannot install $FNAME. Does $USER have privileges?
-        chmod 0644 $FNAME
+        if test "$mode" = 'install'; then
+          cp "$f" "$FNAME"
+          if test ! -e "$FNAME"; then
+            echo "Cannot install $FNAME. Does $USER have privileges? "
+            exit 1
+          fi
+          chmod 0644 $FNAME
+        elif test "$mode" = 'uninstall'; then
+          rm -f "$FNAME"
+          if test -e "$FNAME"; then
+            echo "Cannot remove $FNAME.  Does $USER have privileges? "
+            exit 1
+          fi
+        fi
     done
 
     # Figures
@@ -161,18 +276,40 @@ if [ "x$BOOKDIR" != "x" -a -f $SRCDIR../docs/htmldocs/using_samba/toc.html ]; th
     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
+        if test "$mode" = 'install'; then
+          cp "$f" "$FNAME"
+          if test ! -e "$FNAME"; then
+            echo "Cannot install $FNAME. Does $USER have privileges? "
+            exit 1
+          fi
+          chmod 0644 $FNAME
+        elif test "$mode" = 'uninstall'; then
+          rm -f "$FNAME"
+          if test -e "$FNAME"; then
+            echo "Cannot remove $FNAME.  Does $USER have privileges? "
+            exit 1
+          fi
+        fi
     done
 
 fi
 
-cat << EOF
+if test "$mode" = 'install'; then
+  cat << EOF
 ======================================================================
 The SWAT files have been installed. Remember to read the documentation
 for information on enabling and using SWAT
 ======================================================================
 EOF
+else
+  cat << EOF
+======================================================================
+The SWAT files have been removed.  You may restore these files using
+the command "make installswat" or "make install" to install binaries, 
+man pages, modules, SWAT, and shell scripts.
+======================================================================
+EOF
+fi
 
 exit 0
 
-- 
cgit 


From bf565b7b7bfef0219db59bf5920abcc522f99aa5 Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vlendec@samba.org>
Date: Fri, 3 Mar 2006 17:00:56 +0000
Subject: r13816: Volunteering :-)

> for the svn log:
>
> - Solaris' /bin/sh doesn't know "test -e" - let's use "test -f" instead
>
> Some volunteer wanna check this in? :)
>
> Cheers
> Bjoern

Volker
(This used to be commit 58d5f2031ac6018417ecd3c2306c120b5c7d1e43)
---
 source3/script/installswat.sh | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

(limited to 'source3/script/installswat.sh')

diff --git a/source3/script/installswat.sh b/source3/script/installswat.sh
index 095ccb897b..427e177362 100755
--- a/source3/script/installswat.sh
+++ b/source3/script/installswat.sh
@@ -51,14 +51,14 @@ for ln in $LANGS; do
     echo $FNAME
     if test "$mode" = 'install'; then
       cp "$f" "$FNAME"
-      if test ! -e "$FNAME"; then
+      if test ! -f "$FNAME"; then
         echo "Cannot install $FNAME. Does $USER have privileges? "
         exit 1
       fi
       chmod 0644 "$FNAME"
     elif test "$mode" = 'uninstall'; then
       rm -f "$FNAME"
-      if test -e "$FNAME"; then
+      if test -f "$FNAME"; then
         echo "Cannot remove $FNAME.  Does $USER have privileges? "
         exit 1
       fi
@@ -84,14 +84,14 @@ for ln in $LANGS; do
       f=$f.tmp
       cp "$f" "$FNAME"
       rm -f "$f"
-      if test ! -e "$FNAME"; then
+      if test ! -f "$FNAME"; then
         echo "Cannot install $FNAME. Does $USER have privileges? "
         exit 1
       fi
       chmod 0644 "$FNAME"
     elif test "$mode" = 'uninstall'; then
       rm -f "$FNAME"
-      if test -e "$FNAME"; then
+      if test -f "$FNAME"; then
         echo "Cannot remove $FNAME.  Does $USER have privileges? "
         exit 1
       fi
@@ -107,14 +107,14 @@ for ln in $LANGS; do
       echo $FNAME
       if test "$mode" = 'install'; then
         cp "$f" "$FNAME"
-        if test ! -e "$FNAME"; then
+        if test ! -f "$FNAME"; then
           echo "Cannot install $FNAME. Does $USER have privileges? "
           exit 1
         fi
         chmod 0644 $FNAME
       elif test "$mode" = 'uninstall'; then
         rm -f "$FNAME"
-        if test -e "$FNAME"; then
+        if test -f "$FNAME"; then
           echo "Cannot remove $FNAME.  Does $USER have privileges? "
           exit 1
         fi
@@ -130,14 +130,14 @@ for ln in $LANGS; do
       echo $FNAME
       if test "$mode" = 'install'; then
         cp "$f" "$FNAME"
-        if test ! -e "$FNAME"; then
+        if test ! -f "$FNAME"; then
           echo "Cannot install $FNAME. Does $USER have privileges? "
           exit 1
         fi
         chmod 0644 $FNAME
       elif test "$mode" = 'uninstall'; then
         rm -f "$FNAME"
-        if test -e "$FNAME"; then
+        if test -f "$FNAME"; then
           echo "Cannot remove $FNAME.  Does $USER have privileges? "
           exit 1
         fi
@@ -171,14 +171,14 @@ if [ -d $SRCDIR../docs/htmldocs/ ]; then
 	  echo $FNAME
           if test "$mode" = 'install'; then
             cp "$f" "$FNAME"
-            if test ! -e "$FNAME"; then
+            if test ! -f "$FNAME"; then
               echo "Cannot install $FNAME. Does $USER have privileges? "
               exit 1
             fi
             chmod 0644 $FNAME
           elif test "$mode" = 'uninstall'; then
             rm -f "$FNAME"
-            if test -e "$FNAME"; then
+            if test -f "$FNAME"; then
               echo "Cannot remove $FNAME.  Does $USER have privileges? "
               exit 1
             fi
@@ -198,14 +198,14 @@ if [ -d $SRCDIR../docs/htmldocs/ ]; then
               echo $FNAME
               if test "$mode" = 'install'; then
                 cp "$f" "$FNAME"
-                if test ! -e "$FNAME"; then
+                if test ! -f "$FNAME"; then
                   echo "Cannot install $FNAME. Does $USER have privileges? "
                   exit 1
                 fi
                 chmod 0644 $FNAME
               elif test "$mode" = 'uninstall'; then
                 rm -f "$FNAME"
-                if test -e "$FNAME"; then
+                if test -f "$FNAME"; then
                   echo "Cannot remove $FNAME.  Does $USER have privileges? "
                   exit 1
                 fi
@@ -238,14 +238,14 @@ if [ "x$BOOKDIR" != "x" -a -f $SRCDIR../docs/htmldocs/using_samba/toc.html ]; th
         echo $FNAME
         if test "$mode" = 'install'; then
           cp "$f" "$FNAME"
-          if test ! -e "$FNAME"; then
+          if test ! -f "$FNAME"; then
             echo "Cannot install $FNAME. Does $USER have privileges? "
             exit 1
           fi
           chmod 0644 $FNAME
         elif test "$mode" = 'uninstall'; then
           rm -f "$FNAME"
-          if test -e "$FNAME"; then
+          if test -f "$FNAME"; then
             echo "Cannot remove $FNAME.  Does $USER have privileges? "
             exit 1
           fi
@@ -257,14 +257,14 @@ if [ "x$BOOKDIR" != "x" -a -f $SRCDIR../docs/htmldocs/using_samba/toc.html ]; th
         echo $FNAME
         if test "$mode" = 'install'; then
           cp "$f" "$FNAME"
-          if test ! -e "$FNAME"; then
+          if test ! -f "$FNAME"; then
             echo "Cannot install $FNAME. Does $USER have privileges? "
             exit 1
           fi
           chmod 0644 $FNAME
         elif test "$mode" = 'uninstall'; then
           rm -f "$FNAME"
-          if test -e "$FNAME"; then
+          if test -f "$FNAME"; then
             echo "Cannot remove $FNAME.  Does $USER have privileges? "
             exit 1
           fi
@@ -278,14 +278,14 @@ if [ "x$BOOKDIR" != "x" -a -f $SRCDIR../docs/htmldocs/using_samba/toc.html ]; th
         echo $FNAME
         if test "$mode" = 'install'; then
           cp "$f" "$FNAME"
-          if test ! -e "$FNAME"; then
+          if test ! -f "$FNAME"; then
             echo "Cannot install $FNAME. Does $USER have privileges? "
             exit 1
           fi
           chmod 0644 $FNAME
         elif test "$mode" = 'uninstall'; then
           rm -f "$FNAME"
-          if test -e "$FNAME"; then
+          if test -f "$FNAME"; then
             echo "Cannot remove $FNAME.  Does $USER have privileges? "
             exit 1
           fi
-- 
cgit 


From a24c545bac9b3ca30a014c11d3a061a647c242ae Mon Sep 17 00:00:00 2001
From: Deryck Hodge <deryck@samba.org>
Date: Fri, 5 May 2006 21:37:13 +0000
Subject: r15466: Install the images for SWAT. And we don't install any
 JavaScript (hold over from a prior SWAT svn ci trunk/ branches/SAMBA_3_0 -m
 (This used to be commit 9bf07ba6cc82113b94f4d1bdac3a95262fff18c0)

---
 source3/script/installswat.sh | 25 +------------------------
 1 file changed, 1 insertion(+), 24 deletions(-)

(limited to 'source3/script/installswat.sh')

diff --git a/source3/script/installswat.sh b/source3/script/installswat.sh
index 427e177362..f4220b3c63 100755
--- a/source3/script/installswat.sh
+++ b/source3/script/installswat.sh
@@ -43,7 +43,7 @@ fi
 for ln in $LANGS; do
 
   # images
-  for f in $SRCDIR../swat/$ln/images/*.png; do
+  for f in $SRCDIR../swat/$ln/images/*.gif; do
     if [ ! -f $f ] ; then
       continue
     fi
@@ -121,29 +121,6 @@ for ln in $LANGS; do
       fi
   done
 
-  # javascripts
-  for f in $SRCDIR../swat/$ln/js/*.js; do
-      if [ ! -f $f ] ; then
-	continue
-      fi
-      FNAME="$DESTDIR/$SWATDIR/$ln/js/`basename $f`"
-      echo $FNAME
-      if test "$mode" = 'install'; then
-        cp "$f" "$FNAME"
-        if test ! -f "$FNAME"; then
-          echo "Cannot install $FNAME. Does $USER have privileges? "
-          exit 1
-        fi
-        chmod 0644 $FNAME
-      elif test "$mode" = 'uninstall'; then
-        rm -f "$FNAME"
-        if test -f "$FNAME"; then
-          echo "Cannot remove $FNAME.  Does $USER have privileges? "
-          exit 1
-        fi
-      fi
-  done
-
 done
 
 # Install/ remove html documentation (if html documentation tree is here)
-- 
cgit 


From b1fed47440717a68368430f4571134d2102afb66 Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Thu, 4 Jan 2007 23:25:04 +0000
Subject: r20535: Fix make install to work when root doesn't have write access
 into the source tree (like when your directory is nfs mounted for
 example....). Jeremy. (This used to be commit
 7dcb61d1b2d08270a8c718328a26ef4866a1c500)

---
 source3/script/installswat.sh | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'source3/script/installswat.sh')

diff --git a/source3/script/installswat.sh b/source3/script/installswat.sh
index f4220b3c63..567bfa1a01 100755
--- a/source3/script/installswat.sh
+++ b/source3/script/installswat.sh
@@ -77,11 +77,15 @@ for ln in $LANGS; do
     echo $FNAME
     if test "$mode" = 'install'; then
       if [ "x$BOOKDIR" = "x" ]; then
-        cat $f | sed 's/@BOOKDIR@.*$//' > $f.tmp
+        cat $f | sed 's/@BOOKDIR@.*$//' > $FNAME.tmp
       else
-        cat $f | sed 's/@BOOKDIR@//' > $f.tmp
+        cat $f | sed 's/@BOOKDIR@//' > $FNAME.tmp
       fi
-      f=$f.tmp
+      if test ! -f "$FNAME.tmp"; then
+        echo "Cannot install $FNAME. Does $USER have privileges? "
+        exit 1
+      fi
+      f=$FNAME.tmp
       cp "$f" "$FNAME"
       rm -f "$f"
       if test ! -f "$FNAME"; then
-- 
cgit 


From 808378cda2e35ed01074b8caba89691e4be35f0b Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox@samba.org>
Date: Tue, 1 Apr 2008 15:53:54 +0200
Subject: installswat: be more portable, use 'printf "%s"' instead of 'echo -n'

Michael
(This used to be commit 8b015c91c9b10c208fe61cefd71ddc9f4fcbec61)
---
 source3/script/installswat.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'source3/script/installswat.sh')

diff --git a/source3/script/installswat.sh b/source3/script/installswat.sh
index 567bfa1a01..40596f3bd8 100755
--- a/source3/script/installswat.sh
+++ b/source3/script/installswat.sh
@@ -10,13 +10,13 @@ case $0 in
 	*uninstall*)
 		echo "Removing SWAT from $DESTDIR/$SWATDIR "
 		echo "Removing the Samba Web Administration Tool "
-		echo -n "Removed "
+		printf "%s" "Removed "
 		mode='uninstall'
 		;;
 	*)
 		echo "Installing SWAT in $DESTDIR/$SWATDIR "
 		echo "Installing the Samba Web Administration Tool "
-		echo -n "Installing "
+		printf "%s" "Installing "
 		mode='install'
 		;;
 esac
-- 
cgit