Changeset 24953 for main/trunk/greenstone2/gsicontrol.sh

Timestamp:

2012-01-18T20:57:09+13:00 (12 years ago)

Author:

ak19

Message:

For non-standard collecthome specified in gsdlsite.cfg on linux, need to remove any extraneous quotes around collecthome before writing it into the apache httpd.conf file.

File:

• main/trunk/greenstone2/gsicontrol.sh (modified) (2 diffs)

main/trunk/greenstone2/gsicontrol.sh

@@ -105 +105 @@
     fi
     echo "Setting config file to use port $port";
+# Need to remove extra quotes around $collecthome. ${string//abc/xyz} does a replace all on abc with xyz
     cat "$GSDLHOME/apache-httpd/$GSDLOS$GSDLARCH/conf/httpd.conf.in" \
     | sed "s@\*\*GSDL_OS_ARCH\*\*@$GSDLOS$GSDLARCH@g" \
@@ -111 +112 @@
     | sed "s@\*\*HOST_IP\*\*@$hostIP@g" \
     | sed "s@\*\*HOSTS\*\*@$hosts@g" \
-    | sed "s@\*\*COLLECTHOME\*\*@$collecthome@g" \
+    | sed "s@\*\*COLLECTHOME\*\*@${collecthome//\"/}@g" \
     | sed "s@\*\*GSDLHOME\*\*@$GSDLHOME@g" \
     | sed "s@\*\*APACHE_HOME_OS\*\*@$GSDLHOME/apache-httpd/$GSDLOS$GSDLARCH@g" \