Changeset 21906

Timestamp:

2010-04-19T14:40:39+12:00 (14 years ago)

Author:

ak19

Message:

Reinstating some of the handling of envvars file to before previous

File:

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

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

@@ -55 +55 @@
 # we're the ones putting the apache httpd together, including the envvars file
 # so we can over-write it
-#if [ -f "$SR/bin/envvars" ]
-#then
-#  echo "[Preserving existing envvars settings.]"
-#  HAD_ENVVARS=yes
-#else
-#  HAD_ENVVARS=no
-#fi
+if [ -f "$SR/bin/envvars" ]
+then
+  echo "[Preserving existing envvars settings.]"
+  HAD_ENVVARS=yes
+else
+  HAD_ENVVARS=no
+fi
 
 # Need to run this script from its own directory 
@@ -97 +97 @@
 chmod u+rwx "$SR/bin/envvars-std"
 
-#if [ $HAD_ENVVARS = no ]
-#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
-
-cp -p "$SR/bin/envvars-std" "$SR/bin/envvars"
+if [ $HAD_ENVVARS = no ]
+then
+    cp -p "$SR/bin/envvars-std" "$SR/bin/envvars"
+fi
+# Either way, do a find and replace on APACHE_HOME_OS in the envvars file
 sed -e "s%\*\*APACHE_HOME_OS\*\*%$SR%" "$SR/bin/envvars" > "$SR/bin/envvars.tmp"
 mv "$SR/bin/envvars.tmp" > "$SR/bin/envvars"