Changeset 17469

Show
Ignore:
Timestamp:
03.10.2008 11:19:19 (11 years ago)
Author:
oranfry
Message:

small fix relating to what we report to the user

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • greenstone3/trunk/gs3-setup.sh

    r17442 r17469  
    126126 
    127127  HINT=`pwd`/packages/jre 
    128   bin/search4j -p $HINT -m $java_min_version &> /dev/null 
     128  FOUNDJAVAHOME=`bin/search4j -p $HINT -m $java_min_version` 
    129129  if [ "$?" != "0" ]; then 
    130130 
    131131    #java is not set up already 
    132     FOUNDJAVAHOME=`bin/search4j -p $HINT -m $java_min_version` 
    133132    if [ "$?" == "0" ]; then 
    134133      #bundled java exists, set up 
     
    138137      #no java exists 
    139138      echo "  - Failed to locate java ($java_min_version or greater)" 
    140       bin/search4j &> /dev/null; if [ "$?" == "0" ]; then echo "  (It looks like you hava java but it's too old)"; fi 
     139      bin/search4j &> /dev/null; 
     140      if [ "$?" == "0" ]; then echo "  (It looks like you hava java but it's too old)"; fi 
    141141      echo "  - Please set JAVA_HOME or JRE_HOME to point to an appropriate java" 
    142142      echo "    And add JAVA_HOME/bin or JRE_HOME/bin to your PATH" 
     
    146146 
    147147    #java is already set up 
    148     echo "  - Found java at: `bin/search4j -m $java_min_version`" 
     148    echo "  - Found java at: $FOUNDJAVAHOME" 
    149149 
    150150  fi