From bf565b7b7bfef0219db59bf5920abcc522f99aa5 Mon Sep 17 00:00:00 2001 From: Volker Lendecke 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/installdat.sh | 4 ++-- source3/script/installmsg.sh | 4 ++-- source3/script/installswat.sh | 36 ++++++++++++++++++------------------ source3/script/uninstallbin.sh | 2 +- 4 files changed, 23 insertions(+), 23 deletions(-) (limited to 'source3') diff --git a/source3/script/installdat.sh b/source3/script/installdat.sh index 298b29452b..59bf2f919d 100755 --- a/source3/script/installdat.sh +++ b/source3/script/installdat.sh @@ -25,7 +25,7 @@ for f in $SRCDIR/codepages/*.dat; do if test "$mode" = 'install'; then echo "Installing $f as $FNAME " cp "$f" "$FNAME" - if test ! -e "$FNAME"; then + if test ! -f "$FNAME"; then echo "Cannot install $FNAME. Does $USER have privileges? " exit 1 fi @@ -33,7 +33,7 @@ for f in $SRCDIR/codepages/*.dat; do elif test "$mode" = 'uninstall'; then echo "Removing $FNAME " rm -f "$FNAME" - if test -e "$FNAME"; then + if test -f "$FNAME"; then echo "Cannot remove $FNAME. Does $USER have privileges? " exit 1 fi diff --git a/source3/script/installmsg.sh b/source3/script/installmsg.sh index 612568bbce..859e4c10cf 100644 --- a/source3/script/installmsg.sh +++ b/source3/script/installmsg.sh @@ -26,7 +26,7 @@ for f in $SRCDIR/po/*.msg; do if test "$mode" = 'install'; then echo "Installing $f as $FNAME " cp "$f" "$FNAME" - if test ! -e "$FNAME"; then + if test ! -f "$FNAME"; then echo "Cannot install $FNAME. Does $USER have privileges? " exit 1 fi @@ -34,7 +34,7 @@ for f in $SRCDIR/po/*.msg; do elif test "$mode" = 'uninstall'; then echo "Removing $FNAME " rm -f "$FNAME" - if test -e "$FNAME"; then + if test -f "$FNAME"; then echo "Cannot remove $FNAME. Does $USER have privileges? " exit 1 fi 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 diff --git a/source3/script/uninstallbin.sh b/source3/script/uninstallbin.sh index 597c5d95a5..5d39b79882 100755 --- a/source3/script/uninstallbin.sh +++ b/source3/script/uninstallbin.sh @@ -25,7 +25,7 @@ for p in $*; do fi # this is a special case, mount needs this in a specific location - if test "$p2" = smbmount -a -e "$DESTDIR/sbin/mount.smbfs"; then + if test "$p2" = smbmount -a -f "$DESTDIR/sbin/mount.smbfs"; then echo "Removing $DESTDIR/sbin/mount.smbfs " rm -f "$DESTDIR/sbin/mount.smbfs" fi -- cgit