From 629120a0a1ee0726cf6f43bf841ca042d2b0229e Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Mon, 6 Oct 2003 19:24:17 +0000 Subject: cosmetic fix when DESTDIR=/ (default) (This used to be commit e660b5752aa129c49b0b665845de2fe4c160be00) --- source3/script/installbin.sh | 8 ++++---- source3/script/installdat.sh | 2 +- source3/script/installdirs.sh | 8 +++++--- source3/script/installman.sh | 2 +- source3/script/installmodules.sh | 4 ++-- source3/script/installmsg.sh | 2 +- source3/script/installscripts.sh | 2 +- source3/script/installswat.sh | 2 +- source3/script/uninstallbin.sh | 8 ++++---- source3/script/uninstallman.sh | 2 +- source3/script/uninstallmodules.sh | 4 ++-- source3/script/uninstallscripts.sh | 2 +- 12 files changed, 24 insertions(+), 22 deletions(-) (limited to 'source3') diff --git a/source3/script/installbin.sh b/source3/script/installbin.sh index fe3bc4c48a..f9fd5298c0 100755 --- a/source3/script/installbin.sh +++ b/source3/script/installbin.sh @@ -2,10 +2,10 @@ INSTALLPERMS=$1 DESTDIR=$2 -BASEDIR=$3 -BINDIR=$4 -LIBDIR=$5 -VARDIR=$6 +BASEDIR=`echo $3 | sed 's/\/\//\//g'` +BINDIR=`echo $4 | sed 's/\/\//\//g'` +LIBDIR=`echo $5 | sed 's/\/\//\//g'` +VARDIR=`echo $6 | sed 's/\/\//\//g'` shift shift shift diff --git a/source3/script/installdat.sh b/source3/script/installdat.sh index 7ff88ac788..4a5b1de5dc 100755 --- a/source3/script/installdat.sh +++ b/source3/script/installdat.sh @@ -1,7 +1,7 @@ #!/bin/sh #fist version March 2002, Herb Lewis -DATDIR=$1 +DATDIR=`echo $1 | sed 's/\/\//\//g'` SRCDIR=$2/ echo Installing dat files in $DATDIR diff --git a/source3/script/installdirs.sh b/source3/script/installdirs.sh index 9557b86d3b..1db46b82ff 100755 --- a/source3/script/installdirs.sh +++ b/source3/script/installdirs.sh @@ -1,11 +1,13 @@ #!/bin/sh while ( test -n "$1" ); do - if [ ! -d $1 ]; then - mkdir -p $1 + + DIRNAME=`echo $1 | sed 's/\/\//\//g'` + if [ ! -d $DIRNAME ]; then + mkdir -p $DIRNAME fi - if [ ! -d $1 ]; then + if [ ! -d $DIRNAME ]; then echo Failed to make directory $1 exit 1 fi diff --git a/source3/script/installman.sh b/source3/script/installman.sh index 5b6bba69ed..c7a8f45095 100755 --- a/source3/script/installman.sh +++ b/source3/script/installman.sh @@ -5,7 +5,7 @@ # modified to accomodate international man pages (inspired # by Japanese edition's approach) -MANDIR=$1 +MANDIR=`echo $1 | sed 's/\/\//\//g'` SRCDIR=$2/ langs=$3 diff --git a/source3/script/installmodules.sh b/source3/script/installmodules.sh index c80da76368..f7c7473338 100755 --- a/source3/script/installmodules.sh +++ b/source3/script/installmodules.sh @@ -1,8 +1,8 @@ #!/bin/sh INSTALLPERMS=$1 -BASEDIR=$2 -LIBDIR=$3 +BASEDIR=`echo $2 | sed 's/\/\//\//g'` +LIBDIR=`echo $3 | sed 's/\/\//\//g'` shift shift shift diff --git a/source3/script/installmsg.sh b/source3/script/installmsg.sh index 30ad404aa0..5a41fe1ca8 100644 --- a/source3/script/installmsg.sh +++ b/source3/script/installmsg.sh @@ -2,7 +2,7 @@ # first version (Sept 2003) written by Shiro Yamada # based on the first verion (March 2002) of installdat.sh written by Herb Lewis -MSGDIR=$1 +MSGDIR=`echo $1 | sed 's/\/\//\//g'` SRCDIR=$2/ echo Installing msg files in $MSGDIR diff --git a/source3/script/installscripts.sh b/source3/script/installscripts.sh index bff5423e7c..81608c3682 100755 --- a/source3/script/installscripts.sh +++ b/source3/script/installscripts.sh @@ -3,7 +3,7 @@ # 5 July 96 Dan.Shearer@UniSA.Edu.Au Don't hardcode script names, get from Make INSTALLPERMS=$1 -BINDIR=$2 +BINDIR=`echo $2 | sed 's/\/\//\//g'` shift shift 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 diff --git a/source3/script/uninstallbin.sh b/source3/script/uninstallbin.sh index a8bbdea7af..5de936fccf 100755 --- a/source3/script/uninstallbin.sh +++ b/source3/script/uninstallbin.sh @@ -2,10 +2,10 @@ #4 July 96 Dan.Shearer@UniSA.edu.au INSTALLPERMS=$1 -BASEDIR=$2 -BINDIR=$3 -LIBDIR=$4 -VARDIR=$5 +BASEDIR=`echo $2 | sed 's/\/\//\//g'` +BINDIR=`echo $3 | sed 's/\/\//\//g'` +LIBDIR=`echo $4 | sed 's/\/\//\//g'` +VARDIR=`echo $5 | sed 's/\/\//\//g'` shift shift shift diff --git a/source3/script/uninstallman.sh b/source3/script/uninstallman.sh index 3126709831..0fea11cd1b 100755 --- a/source3/script/uninstallman.sh +++ b/source3/script/uninstallman.sh @@ -6,7 +6,7 @@ # by Japanese edition's approach) -MANDIR=$1 +MANDIR=`echo $1 | sed 's/\/\//\//g'` SRCDIR=$2 langs=$3 diff --git a/source3/script/uninstallmodules.sh b/source3/script/uninstallmodules.sh index 30582a39fa..ac83af3dc9 100755 --- a/source3/script/uninstallmodules.sh +++ b/source3/script/uninstallmodules.sh @@ -2,8 +2,8 @@ #4 July 96 Dan.Shearer@UniSA.edu.au INSTALLPERMS=$1 -BASEDIR=$2 -LIBDIR=$3 +BASEDIR=`echo $2 | sed 's/\/\//\//g'` +LIBDIR=`echo $3 | sed 's/\/\//\//g'` shift shift shift diff --git a/source3/script/uninstallscripts.sh b/source3/script/uninstallscripts.sh index 13104acedd..cf7fd71999 100755 --- a/source3/script/uninstallscripts.sh +++ b/source3/script/uninstallscripts.sh @@ -2,7 +2,7 @@ # 5 July 96 Dan.Shearer@UniSA.Edu.Au - almost identical to uninstallbin.sh INSTALLPERMS=$1 -BINDIR=$2 +BINDIR=`echo $2 | sed 's/\/\//\//g'` shift shift -- cgit