Changeset 19040

Timestamp:

2009-04-17T18:18:11+12:00 (15 years ago)

Author:

ak19

Message:

Whenever I'm testing the binary distribution installation of apache-httpd, I move the regular version out of the way. However once the tests are finished, I forget to move the regular installation of GS2's apache-httpd back and this catches me out everytime, because trying to start the webserver does not tell me that the webserver files are entirely missing or relocated. Therefore, when gs2-server.sh is launched, it now checks that the GSDLHOME/apache-httpd folder actually exists before trying to issue commands to this.

File:

• gsdl/trunk/gs2-server.sh (modified) (3 diffs)

gsdl/trunk/gs2-server.sh

@@ -42 +42 @@
 ##  -------- Run the Greenstone 2 Server --------
 
-
 ##  ---- Determine GSDLHOME ----
 gsdl2path=
@@ -58 +57 @@
 fi
 
+
+# First test that there is actually something that can be run...
+# Exit if the apache-httpd folder doesn't exist for some reason
+# (The errors reported when the apache webserver does not exist 
+# in the correct location are not at all helpful).
+if [ ! -d "$GSDLHOME/apache-httpd" ]; then
+    echo ""
+    echo "UNABLE TO CONTINUE: There is no apache-httpd directory."
+    echo "It does not look like the local apache webserver has been installed."
+    echo "Exiting..."
+    echo ""
+    exit 1
+fi
+
 # If there's no llssite.cfg file, copy from the template
 if [ ! -e "$GSDLHOME/llssite.cfg" ]; then
@@ -65 +78 @@
     echo "Warning: could not find llssite.cfg.in to create llssite.cfg from."
     fi
-fi
-    
+fi  
 
 # JRE_HOME or JAVA_HOME must be set correctly to run this program