Changeset 18878

Timestamp:

2009-04-03T13:09:02+13:00 (15 years ago)

Author:

ak19

Message:

Spaces in paths preserved with quotes

File:

• gsdl/trunk/runtime-src/packages/apache-httpd/install-bindist.sh (modified) (2 diffs)

gsdl/trunk/runtime-src/packages/apache-httpd/install-bindist.sh

@@ -45 +45 @@
 done
  
-if [ .$1 = . ]
+if [ "x$1" = "x" ]
 then
-  SR=**APACHE_HOME_OS**
   echo "Number of arguments should be 1. Provide the root directory for the web server."
   exit 1
 else
-  SR=$1
+  SR="$1"
 fi
 
-if [ -f $SR/bin/envvars ]
+if [ -f "$SR/bin/envvars" ]
 then
   echo "[Preserving existing envvars settings.]"
@@ -64 +63 @@
 # Need to run this script from its own directory 
 # instead of whatever directory it may be called from
-currentdir=$(cd `dirname $0` && pwd)
-cd $currentdir
+#currentdir=$(cd `dirname "$0"` && pwd)
+currentdir="`dirname \"$0\"`"
+currentdir="`cd \"$currentdir\" && pwd`"
+cd "$currentdir"
 
-sed -e "s%\*\*APACHE_HOME_OS\*\*%$SR%" $SR/conf/httpd.conf.in > $SR/conf/httpd.conf
+sed -e "s%\*\*APACHE_HOME_OS\*\*%$SR%" "$SR/conf/httpd.conf.in" > "$SR/conf/httpd.conf"
 
 sed -e "s;^#!\@perlbin\@.*;#!$PERL;" -e "s;\@exp_installbuilddir\@;$SR/build;" \
-    apxs.in > $SR/bin/apxs
+    apxs.in > "$SR/bin/apxs"
 
 # usually we're updating existing files, so need to copy them over into tmp files first
 PRE=`grep "^prefix = " build/config_vars.mk`
 PRE=`echo $PRE | sed -e "s;prefix = ;;"`
-sed -e "s;$PRE;$SR;" build/config_vars.mk > $SR/build/config_vars.mk.tmp
-mv $SR/build/config_vars.mk.tmp $SR/build/config_vars.mk
-chmod u+rwx $SR/build/config_vars.mk
+sed -e "s;$PRE;$SR;" build/config_vars.mk > "$SR/build/config_vars.mk.tmp"
+mv "$SR/build/config_vars.mk.tmp" "$SR/build/config_vars.mk"
+chmod u+rwx "$SR/build/config_vars.mk"
 
-sed -e "s;^#!/.*;#!$PERL;" bin/dbmmanage > $SR/bin/dbmmanage.tmp
-mv $SR/bin/dbmmanage.tmp $SR/bin/dbmmanage
+sed -e "s;^#!/.*;#!$PERL;" bin/dbmmanage > "$SR/bin/dbmmanage.tmp"
+mv "$SR/bin/dbmmanage.tmp" "$SR/bin/dbmmanage"
 
 sed -e "s%\*\*APACHE_HOME_OS\*\*%$SR%" \
-        -e "s%^HTTPD=.*$%HTTPD=\"$SR/bin/httpd -d $SR\"%" bin/apachectl > $SR/bin/apachectl.tmp
-mv $SR/bin/apachectl.tmp $SR/bin/apachectl
-chmod u+rwx $SR/bin/apachectl
+        -e "s%^HTTPD=.*$%HTTPD=\"$SR/bin/httpd -d $SR\"%" bin/apachectl > "$SR/bin/apachectl.tmp"
+mv "$SR/bin/apachectl.tmp" "$SR/bin/apachectl"
+chmod u+rwx "$SR/bin/apachectl"
 
 sed -e "s%\*\*APACHE_HOME_OS\*\*%$SR%" \
-        bin/envvars-std > $SR/bin/envvars-std.tmp
-mv $SR/bin/envvars-std.tmp $SR/bin/envvars-std
-chmod u+rwx $SR/bin/envvars-std
+        bin/envvars-std > "$SR/bin/envvars-std.tmp"
+mv "$SR/bin/envvars-std.tmp" "$SR/bin/envvars-std"
+chmod u+rwx "$SR/bin/envvars-std"
 
 if [ $HAD_ENVVARS = no ]
 then
-    cp -p $SR/bin/envvars-std $SR/bin/envvars
+    cp -p "$SR/bin/envvars-std" "$SR/bin/envvars"
 fi