From 4f9c8e28ac43bf3c64f3edbadf7051fc9091624a Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Wed, 5 May 2004 15:52:11 +0000 Subject: [PATCH] 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 ++++++++++++++++++++++------------- swat/help/welcome.html | 4 ++- 2 files changed, 37 insertions(+), 22 deletions(-) diff --git a/source3/script/installswat.sh b/source3/script/installswat.sh index 495386e0b7a..67586a89674 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) diff --git a/swat/help/welcome.html b/swat/help/welcome.html index 59429ba47df..91d4d7eb008 100644 --- a/swat/help/welcome.html +++ b/swat/help/welcome.html @@ -57,7 +57,9 @@ Please choose a configuration action using one of the above buttons
  • Books