svn commit: samba r13816 - branches/SAMBA_3_0/source/script trunk/source/script

vlendec at samba.org vlendec at samba.org
Fri Mar 3 17:00:57 GMT 2006


Author: vlendec
Date: 2006-03-03 17:00:56 +0000 (Fri, 03 Mar 2006)
New Revision: 13816

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=13816

Log:
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


Modified:
   branches/SAMBA_3_0/source/script/installdat.sh
   branches/SAMBA_3_0/source/script/installmsg.sh
   branches/SAMBA_3_0/source/script/installswat.sh
   branches/SAMBA_3_0/source/script/uninstallbin.sh
   trunk/source/script/installdat.sh
   trunk/source/script/installmsg.sh
   trunk/source/script/installswat.sh
   trunk/source/script/uninstallbin.sh


Changeset:
Modified: branches/SAMBA_3_0/source/script/installdat.sh
===================================================================
--- branches/SAMBA_3_0/source/script/installdat.sh	2006-03-03 16:44:30 UTC (rev 13815)
+++ branches/SAMBA_3_0/source/script/installdat.sh	2006-03-03 17:00:56 UTC (rev 13816)
@@ -25,7 +25,7 @@
 	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 @@
 	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

Modified: branches/SAMBA_3_0/source/script/installmsg.sh
===================================================================
--- branches/SAMBA_3_0/source/script/installmsg.sh	2006-03-03 16:44:30 UTC (rev 13815)
+++ branches/SAMBA_3_0/source/script/installmsg.sh	2006-03-03 17:00:56 UTC (rev 13816)
@@ -26,7 +26,7 @@
 	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 @@
 	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

Modified: branches/SAMBA_3_0/source/script/installswat.sh
===================================================================
--- branches/SAMBA_3_0/source/script/installswat.sh	2006-03-03 16:44:30 UTC (rev 13815)
+++ branches/SAMBA_3_0/source/script/installswat.sh	2006-03-03 17:00:56 UTC (rev 13816)
@@ -51,14 +51,14 @@
     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 @@
       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 @@
       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 @@
       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 @@
 	  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 @@
               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 @@
         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 @@
         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 @@
         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

Modified: branches/SAMBA_3_0/source/script/uninstallbin.sh
===================================================================
--- branches/SAMBA_3_0/source/script/uninstallbin.sh	2006-03-03 16:44:30 UTC (rev 13815)
+++ branches/SAMBA_3_0/source/script/uninstallbin.sh	2006-03-03 17:00:56 UTC (rev 13816)
@@ -25,7 +25,7 @@
   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

Modified: trunk/source/script/installdat.sh
===================================================================
--- trunk/source/script/installdat.sh	2006-03-03 16:44:30 UTC (rev 13815)
+++ trunk/source/script/installdat.sh	2006-03-03 17:00:56 UTC (rev 13816)
@@ -25,7 +25,7 @@
 	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 @@
 	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

Modified: trunk/source/script/installmsg.sh
===================================================================
--- trunk/source/script/installmsg.sh	2006-03-03 16:44:30 UTC (rev 13815)
+++ trunk/source/script/installmsg.sh	2006-03-03 17:00:56 UTC (rev 13816)
@@ -26,7 +26,7 @@
 	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 @@
 	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

Modified: trunk/source/script/installswat.sh
===================================================================
--- trunk/source/script/installswat.sh	2006-03-03 16:44:30 UTC (rev 13815)
+++ trunk/source/script/installswat.sh	2006-03-03 17:00:56 UTC (rev 13816)
@@ -51,14 +51,14 @@
     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 @@
       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 @@
       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 @@
       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 @@
 	  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 @@
               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 @@
         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 @@
         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 @@
         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

Modified: trunk/source/script/uninstallbin.sh
===================================================================
--- trunk/source/script/uninstallbin.sh	2006-03-03 16:44:30 UTC (rev 13815)
+++ trunk/source/script/uninstallbin.sh	2006-03-03 17:00:56 UTC (rev 13816)
@@ -25,7 +25,7 @@
   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



More information about the samba-cvs mailing list