Changeset 21895 for main/trunk/greenstone2/runtime-src

Timestamp:

2010-04-16T20:20:39+12:00 (14 years ago)

Author:

ak19

Message:

Can set envvars ourselves instead of preserving it 'if it exists'. It will exist because we copy it into the installation location. Therefore we now always do a replace on the placeholder APACHE_HOME_OS in this file.

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

@@ -53 +53 @@
 fi
 
-if [ -f "$SR/bin/envvars" ]
-then
-  echo "[Preserving existing envvars settings.]"
-  HAD_ENVVARS=yes
-else
-  HAD_ENVVARS=no
-fi
+# 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
 
 # Need to run this script from its own directory 
@@ -95 +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
- 
+#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"
+sed -e "s%\*\*APACHE_HOME_OS\*\*%$SR%" "$SR/bin/envvars" > "$SR/bin/envvars.tmp"
+mv "$SR/bin/envvars.tmp" > "$SR/bin/envvars"
+
 
 # Non-crucial files (replacements not essential)