X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=config%2Finstall-sh;h=36f96f3e033cfaeefc092147d99d92f78e030d12;hb=6f9e0225e8bfc62cd1f1212ffa72f5345c47b0b5;hp=8dff05b74acefbddafadf17fb4ebcdc9cddabb2e;hpb=76c4a5060023e470ec057c44ec3cee18acd7b233;p=gnulib.git

diff --git a/config/install-sh b/config/install-sh
index 8dff05b74..36f96f3e0 100755
--- a/config/install-sh
+++ b/config/install-sh
@@ -55,7 +55,7 @@ dst=""
 dir_arg=""
 
 while [ x"$1" != x ]; do
-    case "$1" in
+    case $1 in
 	-c) instcmd=$cpprog
 	    shift
 	    continue;;
@@ -106,10 +106,10 @@ done
 
 if [ x"$src" = x ]
 then
-	echo "install:	no input file specified" >&2
+	echo "$0: no input file specified" >&2
 	exit 1
 else
-	true
+	:
 fi
 
 if [ x"$dir_arg" != x ]; then
@@ -128,20 +128,20 @@ else
 # might cause directories to be created, which would be especially bad
 # if $src (and thus $dsttmp) contains '*'.
 
-	if [ -f "$src" -o -d "$src" ]
+	if [ -f "$src" ] || [ -d "$src" ]
 	then
-		true
+		:
 	else
-		echo "install:  $src does not exist" >&2
+		echo "$0: $src does not exist" >&2
 		exit 1
 	fi
 
 	if [ x"$dst" = x ]
 	then
-		echo "install:	no destination specified" >&2
+		echo "$0: no destination specified" >&2
 		exit 1
 	else
-		true
+		:
 	fi
 
 # If destination is a directory, append the input filename; if your system
@@ -151,7 +151,7 @@ else
 	then
 		dst=$dst/`basename "$src"`
 	else
-		true
+		:
 	fi
 fi
 
@@ -183,7 +183,7 @@ while [ $# -ne 0 ] ; do
         then
 		$mkdirprog "$pathcomp"
 	else
-		true
+		:
 	fi
 
 	pathcomp=$pathcomp/
@@ -194,10 +194,10 @@ if [ x"$dir_arg" != x ]
 then
 	$doit $instcmd "$dst" &&
 
-	if [ x"$chowncmd" != x ]; then $doit $chowncmd "$dst"; else true ; fi &&
-	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd "$dst"; else true ; fi &&
-	if [ x"$stripcmd" != x ]; then $doit $stripcmd "$dst"; else true ; fi &&
-	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd "$dst"; else true ; fi
+	if [ x"$chowncmd" != x ]; then $doit $chowncmd "$dst"; else : ; fi &&
+	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd "$dst"; else : ; fi &&
+	if [ x"$stripcmd" != x ]; then $doit $stripcmd "$dst"; else : ; fi &&
+	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd "$dst"; else : ; fi
 else
 
 # If we're going to rename the final executable, determine the name now.
@@ -216,7 +216,7 @@ else
 	then
 		dstfile=`basename "$dst"`
 	else
-		true
+		:
 	fi
 
 # Make a couple of temp file names in the proper directory.
@@ -231,7 +231,7 @@ else
 
 # Move or copy the file name to the temp name
 
-	$doit $instcmd $src "$dsttmp" &&
+	$doit $instcmd "$src" "$dsttmp" &&
 
 # and set any options; do chmod last to preserve setuid bits
 
@@ -239,12 +239,12 @@ else
 # ignore errors from any of these, just make sure not to ignore
 # errors from the above "$doit $instcmd $src $dsttmp" command.
 
-	if [ x"$chowncmd" != x ]; then $doit $chowncmd "$dsttmp";else true;fi &&
-	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd "$dsttmp";else true;fi &&
-	if [ x"$stripcmd" != x ]; then $doit $stripcmd "$dsttmp";else true;fi &&
-	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd "$dsttmp";else true;fi &&
+	if [ x"$chowncmd" != x ]; then $doit $chowncmd "$dsttmp"; else :;fi &&
+	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd "$dsttmp"; else :;fi &&
+	if [ x"$stripcmd" != x ]; then $doit $stripcmd "$dsttmp"; else :;fi &&
+	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd "$dsttmp"; else :;fi &&
 
-# Now remove or move any old file at destination location.  We try this
+# Now remove or move aside any old file at destination location.  We try this
 # two ways since rm can't unlink itself on some systems and the destination
 # file might be busy for other reasons.  In this case, the final cleanup
 # might fail but the new file should still install successfully.
@@ -255,11 +255,11 @@ else
 		$doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null ||
 		$doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null ||
 		{
-		  echo "install: cannot unlink or rename $dstdir/$dstfile" >&2
+		  echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
 		  (exit 1); exit
 		}
 	else
-		true
+		:
 	fi
 } &&