Changeset 18879 for gsdl

Timestamp:

2009-04-03T14:09:53+13:00 (15 years ago)

Author:

ak19

Message:

1. More instances where spaces in filepaths need to be escaped; 2. Apachectl is not careful about spaces, so Oran suggested how we can modify the uses of the HTTPD variable in this file to ensure the spaces in paths are correctly preserved

File:

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

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

@@ -70 +70 @@
 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;" \
+sed -e "s;^#!\@perlbin\@.*;#!$PERL;" -e "s;\@exp_installbuilddir\@;\"$SR/build\";" \
     apxs.in > "$SR/bin/apxs"
 
@@ -76 +76 @@
 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"
+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"
@@ -83 +83 @@
 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"
+sed -e "s%\*\*APACHE_HOME_OS\*\*%\"$SR\"%" \
+    -e "s%^HTTPD=.*$%HTTPD=\"$SR/bin/httpd\"%" \
+    -e "s%\$HTTPD%\"\$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%" \
+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"