Changeset 21894

Show
Ignore:
Timestamp:
16.04.2010 16:44:44 (10 years ago)
Author:
ak19
Message:

1. Removed insertion of unnecessary quotes when replacing the APACHE_HOME_OS placeholder. 2. envvars file may also need a sed expression to replace the placeholder.

Files:
1 modified

Legend:

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

    r19787 r21894  
    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 
     
    7676#PRE=`grep "^prefix = " build/config_vars.mk` 
    7777#PRE=`echo $PRE | sed -e "s;prefix = ;;"` 
    78 sed -e "s%\*\*APACHE_HOME_OS\*\*%\"$SR\"%" build/config_vars.mk > "$SR/build/config_vars.mk.tmp" 
     78sed -e "s%\*\*APACHE_HOME_OS\*\*%$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# IMPORTANT: need to insert the ServerRoot nested inside quotes into the apachectl file 
    8586sed -e "s%\*\*APACHE_HOME_OS\*\*%\"$SR\"%" \ 
    8687    -e "s%^HTTPD=.*$%HTTPD=\"$SR/bin/httpd\"%" \ 
     
    8990chmod u+rwx "$SR/bin/apachectl" 
    9091 
    91 sed -e "s%\*\*APACHE_HOME_OS\*\*%\"$SR\"%" \ 
     92sed -e "s%\*\*APACHE_HOME_OS\*\*%$SR%" \ 
    9293        bin/envvars-std > "$SR/bin/envvars-std.tmp" 
    9394mv "$SR/bin/envvars-std.tmp" "$SR/bin/envvars-std" 
     
    9798then 
    9899    cp -p "$SR/bin/envvars-std" "$SR/bin/envvars" 
     100    sed -e "s%\*\*APACHE_HOME_OS\*\*%$SR%" "$SR/bin/envvars" > "$SR/bin/envvars.tmp" 
     101    mv "$SR/bin/envvars.tmp" > "$SR/bin/envvars" 
    99102fi 
    100103