Changeset 19040

Show
Ignore:
Timestamp:
17.04.2009 18:18:11 (11 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.

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • gsdl/trunk/gs2-server.sh

    r19023 r19040  
    4242##  -------- Run the Greenstone 2 Server -------- 
    4343 
    44  
    4544##  ---- Determine GSDLHOME ---- 
    4645gsdl2path= 
     
    5857fi 
    5958 
     59 
     60# First test that there is actually something that can be run... 
     61# Exit if the apache-httpd folder doesn't exist for some reason 
     62# (The errors reported when the apache webserver does not exist  
     63# in the correct location are not at all helpful). 
     64if [ ! -d "$GSDLHOME/apache-httpd" ]; then 
     65    echo "" 
     66    echo "UNABLE TO CONTINUE: There is no apache-httpd directory." 
     67    echo "It does not look like the local apache webserver has been installed." 
     68    echo "Exiting..." 
     69    echo "" 
     70    exit 1 
     71fi 
     72 
    6073# If there's no llssite.cfg file, copy from the template 
    6174if [ ! -e "$GSDLHOME/llssite.cfg" ]; then 
     
    6578    echo "Warning: could not find llssite.cfg.in to create llssite.cfg from." 
    6679    fi 
    67 fi 
    68      
     80fi   
    6981 
    7082# JRE_HOME or JAVA_HOME must be set correctly to run this program