Changeset 18879

Show
Ignore:
Timestamp:
03.04.2009 14:09:53 (10 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

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • gsdl/trunk/runtime-src/packages/apache-httpd/install-bindist.sh

    r18878 r18879  
    7070sed -e "s%\*\*APACHE_HOME_OS\*\*%$SR%" "$SR/conf/httpd.conf.in" > "$SR/conf/httpd.conf" 
    7171 
    72 sed -e "s;^#!\@perlbin\@.*;#!$PERL;" -e "s;\@exp_installbuilddir\@;$SR/build;" \ 
     72sed -e "s;^#!\@perlbin\@.*;#!$PERL;" -e "s;\@exp_installbuilddir\@;\"$SR/build\";" \ 
    7373    apxs.in > "$SR/bin/apxs" 
    7474 
     
    7676PRE=`grep "^prefix = " build/config_vars.mk` 
    7777PRE=`echo $PRE | sed -e "s;prefix = ;;"` 
    78 sed -e "s;$PRE;$SR;" build/config_vars.mk > "$SR/build/config_vars.mk.tmp" 
     78sed -e "s;$PRE;\"$SR\";" build/config_vars.mk > "$SR/build/config_vars.mk.tmp" 
    7979mv "$SR/build/config_vars.mk.tmp" "$SR/build/config_vars.mk" 
    8080chmod u+rwx "$SR/build/config_vars.mk" 
     
    8383mv "$SR/bin/dbmmanage.tmp" "$SR/bin/dbmmanage" 
    8484 
    85 sed -e "s%\*\*APACHE_HOME_OS\*\*%$SR%" \ 
    86         -e "s%^HTTPD=.*$%HTTPD=\"$SR/bin/httpd -d $SR\"%" bin/apachectl > "$SR/bin/apachectl.tmp" 
     85sed -e "s%\*\*APACHE_HOME_OS\*\*%\"$SR\"%" \ 
     86    -e "s%^HTTPD=.*$%HTTPD=\"$SR/bin/httpd\"%" \ 
     87    -e "s%\$HTTPD%\"\$HTTPD\" -d \"$SR\"%" bin/apachectl > "$SR/bin/apachectl.tmp" 
    8788mv "$SR/bin/apachectl.tmp" "$SR/bin/apachectl" 
    8889chmod u+rwx "$SR/bin/apachectl" 
    8990 
    90 sed -e "s%\*\*APACHE_HOME_OS\*\*%$SR%" \ 
     91sed -e "s%\*\*APACHE_HOME_OS\*\*%\"$SR\"%" \ 
    9192        bin/envvars-std > "$SR/bin/envvars-std.tmp" 
    9293mv "$SR/bin/envvars-std.tmp" "$SR/bin/envvars-std"