Changeset 23660 for main/trunk/greenstone2/gs2-server.sh

Timestamp:

2011-02-02T15:22:45+13:00 (13 years ago)

Author:

ak19

Message:

Sherlock Sam solved the mysterious problem of why the Mac binary's gs2-server.sh was working but not when the apache server was launched through GLI and whey both worked for the source distribution. The reason was that GLI runs gs2-server from the GLI folder, so a mere test for the existence of an apache-httpd dir will fail when done from the GLI fplder, unless prefixed with the full path to it.

File:

• main/trunk/greenstone2/gs2-server.sh (modified) (1 diff)

main/trunk/greenstone2/gs2-server.sh

@@ -64 +64 @@
 fi
 
-# On MAC, need to tell apache to find and use its own libiconv(?).dylib
-if test -e apache-httpd ; then
+# On MAC, need to tell apache to find and use its own libiconv<num>.dylib
+# If gs2-server.sh is run from GLI, we can't just test for the existence
+# of "apache-httpd", so use the full path (from GSDLHOME) to test it exists
+if test -e "$GSDLHOME/apache-httpd" ; then
     echo "+Adding in executable path for apache-httpd"
     PATH=$GSDLHOME/apache-httpd/$GSDLOS/bin:$PATH