[GRASS-SVN] r40591 - grass/branches/develbranch_6

[svn_grass at osgeo.org]

Author: hamish
Date: 2010-01-21 01:02:07 -0500 (Thu, 21 Jan 2010)
New Revision: 40591

Modified:
   grass/branches/develbranch_6/install-sh
Log:
quote variables which might contain pathnames with spaces

Modified: grass/branches/develbranch_6/install-sh
===================================================================
--- grass/branches/develbranch_6/install-sh	2010-01-21 04:42:46 UTC (rev 40590)
+++ grass/branches/develbranch_6/install-sh	2010-01-21 06:02:07 UTC (rev 40591)
@@ -97,21 +97,21 @@
 	    shift
 	    continue;;
 
-	-t=*) transformarg=`echo $1 | sed 's/-t=//'`
+	-t=*) transformarg=`echo "$1" | sed 's/-t=//'`
 	    shift
 	    continue;;
 
-	-b=*) transformbasename=`echo $1 | sed 's/-b=//'`
+	-b=*) transformbasename=`echo "$1" | sed 's/-b=//'`
 	    shift
 	    continue;;
 
 	*)  if [ x"$src" = x ]
 	    then
-		src=$1
+		src="$1"
 	    else
 		# this colon is to work around a 386BSD /bin/sh bug
 		:
-		dst=$1
+		dst="$1"
 	    fi
 	    shift
 	    continue;;
@@ -127,10 +127,10 @@
 fi
 
 if [ x"$dir_arg" != x ]; then
-	dst=$src
+	dst="$src"
 	src=""
 	
-	if [ -d $dst ]; then
+	if [ -d "$dst" ]; then
 		instcmd=:
 	else
 		instcmd=mkdir
@@ -141,7 +141,7 @@
 # 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" -o -d "$src" ]
 	then
 		true
 	else
@@ -160,7 +160,7 @@
 # If destination is a directory, append the input filename; if your system
 # does not like double slashes in filenames, you may need to add some logic
 
-	if [ -d $dst ]
+	if [ -d "$dst" ]
 	then
 		dst="$dst"/`basename $src`
 	else
@@ -169,7 +169,7 @@
 fi
 
 ## this sed command emulates the dirname command
-dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
+dstdir=`echo "$dst" | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
 
 # Make sure that the destination directory exists.
 #  this part is taken from Noah Friedman's mkinstalldirs script
@@ -183,7 +183,7 @@
 oIFS="${IFS}"
 # Some sh's can't handle IFS=/ for some reason.
 IFS='%'
-set - `echo ${dstdir} | sed -e 's@/@%@g' -e 's@^%@/@'`
+set - `echo "${dstdir}" | sed -e 's@/@%@g' -e 's@^%@/@'`
 IFS="${oIFS}"
 
 pathcomp=''
@@ -205,42 +205,42 @@
 
 if [ x"$dir_arg" != x ]
 then
-	$doit $instcmd $dst &&
+	"$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 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
 else
 
 # If we're going to rename the final executable, determine the name now.
 
 	if [ x"$transformarg" = x ] 
 	then
-		dstfile=`basename $dst`
+		dstfile=`basename "$dst"`
 	else
-		dstfile=`basename $dst $transformbasename | 
-			sed $transformarg`$transformbasename
+		dstfile=`basename "$dst" "$transformbasename" | 
+			sed "$transformarg"`"$transformbasename"
 	fi
 
 # don't allow the sed command to completely eliminate the filename
 
 	if [ x"$dstfile" = x ] 
 	then
-		dstfile=`basename $dst`
+		dstfile=`basename "$dst"`
 	else
 		true
 	fi
 
 # Make a temp file name in the proper directory.
 
-	dsttmp=$dstdir/#inst.$$#
+	dsttmp="$dstdir"/#inst.$$#
 
 # Move or copy the file name to the temp name
 
-	$doit $instcmd $src $dsttmp &&
+	"$doit" "$instcmd" "$src" "$dsttmp" &&
 
-	trap "rm -f ${dsttmp}" 0 &&
+	trap 'rm -f "${dsttmp}"' 0 &&
 
 # and set any options; do chmod last to preserve setuid bits
 
@@ -248,15 +248,15 @@
 # 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 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 &&
 
 # Now rename the file to the real destination.
 
-	$doit $rmcmd -f $dstdir/$dstfile &&
-	$doit $mvcmd $dsttmp $dstdir/$dstfile 
+	"$doit" "$rmcmd" -f "$dstdir/$dstfile" &&
+	"$doit" "$mvcmd" "$dsttmp" "$dstdir/$dstfile" 
 
 fi &&