Changeset 21894 for main/trunk/greenstone2/runtime-src/packages

Timestamp:

2010-04-16T16:44:44+12:00 (14 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.

File:

• main/trunk/greenstone2/runtime-src/packages/apache-httpd/install-bindist.sh (modified) (5 diffs)

main/trunk/greenstone2/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%\*\*APACHE_HOME_OS\*\*%\"$SR\"%" build/config_vars.mk > "$SR/build/config_vars.mk.tmp"
+sed -e "s%\*\*APACHE_HOME_OS\*\*%$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"
 
+# IMPORTANT: need to insert the ServerRoot nested inside quotes into the apachectl file
 sed -e "s%\*\*APACHE_HOME_OS\*\*%\"$SR\"%" \
     -e "s%^HTTPD=.*$%HTTPD=\"$SR/bin/httpd\"%" \
@@ -89 +90 @@
 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"
@@ -97 +98 @@
 then
     cp -p "$SR/bin/envvars-std" "$SR/bin/envvars"
+    sed -e "s%\*\*APACHE_HOME_OS\*\*%$SR%" "$SR/bin/envvars" > "$SR/bin/envvars.tmp"
+    mv "$SR/bin/envvars.tmp" > "$SR/bin/envvars"
 fi