Changeset 19740

Show
Ignore:
Timestamp:
04.06.2009 18:00:44 (10 years ago)
Author:
ak19
Message:

Modification to make it the same as the findjava.sh used by gs2-server.sh (at present that one's located in the GS2 installation folder, later we can have just one file that is then checked out from svn). Now findjava.sh won't check for the version of GS before testing the location for search4j.

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • gli/trunk/findjava.sh

    r19737 r19740  
    124124 
    125125# sus out search4j 
    126 # first look for compiled search4j executable inside GLI folder 
     126# first look for compiled search4j executable inside the current folder 
    127127if [ -f search4j ]; then 
    128128    SEARCH4J_EXECUTABLE=search4j     
    129 elif [ "x$_version" != "x" ]; then 
    130      # version known, look for a compiled search4j in a GS installation 
    131     if [ "$_version" -eq 2 -a -e "$GSDLHOME/bin/$GSDLOS/search4j" ]; then 
    132     SEARCH4J_EXECUTABLE=$GSDLHOME/bin/$GSDLOS/search4j 
    133     elif [ "$_version" -eq 3 -a -e "$GSDL3SRCHOME/bin/$GSDLOS/search4j" ]; then 
    134     SEARCH4J_EXECUTABLE=$GSDL3SRCHOME/bin/search4j 
    135     elif [ -e "../bin/$GSDLOS/search4j" ]; then 
    136     SEARCH4J_EXECUTABLE=../bin/$GSDLOS/search4j 
    137     elif [ -e "../bin/search4j" ]; then 
    138     SEARCH4J_EXECUTABLE=../bin/search4j 
    139     else 
    140     echo "Couldn't determine the location of the search4j executable" 
    141     echo "If you are running Greenstone2" 
    142     echo "   * check GSDLHOME is set" 
    143     echo "   * check bin/$GSDLOS/search4j exists" 
    144     echo "   * check bin/$GSDLOS/search4j is executable" 
    145     echo "If you are running Greenstone3" 
    146     echo "   * check GSDL3SRCHOME is set" 
    147     echo "   * check bin/search4j exists" 
    148     echo "   * check bin/search4j is executable" 
    149     echo "   * try running 'ant compile-search4j'" 
    150     fi 
     129elif [ -e "$GSDLHOME/bin/$GSDLOS/search4j" ]; then 
     130    SEARCH4J_EXECUTABLE=$GSDLHOME/bin/$GSDLOS/search4j 
     131elif [ -e "$GSDL3SRCHOME/bin/$GSDLOS/search4j" ]; then 
     132    SEARCH4J_EXECUTABLE=$GSDL3SRCHOME/bin/search4j 
     133elif [ -e "../bin/$GSDLOS/search4j" ]; then 
     134    SEARCH4J_EXECUTABLE=../bin/$GSDLOS/search4j 
     135elif [ -e "../bin/search4j" ]; then 
     136    SEARCH4J_EXECUTABLE=../bin/search4j 
     137else 
     138    echo "Couldn't determine the location of the search4j executable" 
     139    echo "If you are running Greenstone2" 
     140    echo "   * check GSDLHOME is set" 
     141    echo "   * check bin/$GSDLOS/search4j exists" 
     142    echo "   * check bin/$GSDLOS/search4j is executable" 
     143    echo "If you are running Greenstone3" 
     144    echo "   * check GSDL3SRCHOME is set" 
     145    echo "   * check bin/search4j exists" 
     146    echo "   * check bin/search4j is executable" 
     147    echo "   * try running 'ant compile-search4j'" 
    151148fi 
    152149