Changeset 20658


Ignore:
Timestamp:
2009-09-21T19:02:45+12:00 (13 years ago)
Author:
ak19
Message:

Allow the user to set the path to javahome. This was necessary for the binary release on MacBook Pro running MacOS 10.4, since search4j gives a bus error on it.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • gsdl/trunk/findjava.sh

    r20655 r20658  
    2222        echo "WARNING: "
    2323        echo "Java Runtime not bundled with this Greenstone installation."
    24         echo "Using JAVA_HOME: %JAVA_HOME%"
    25         echo "(NOTE: this needs to be %DISPLAY_MIN_VERSION% or higher.)"
     24        echo "Using JAVA_HOME: $JAVA_HOME"
     25        echo "(NOTE: this needs to be $MIN_DISPLAY_VERSION or higher.)"
    2626        echo "***************************************************************************"
    2727        echo
     
    121121## ---- Check Java ----
    122122# Some users may set this line manually
    123 #JAVA_HOME=
     123javahome=
    124124gslang=$1
    125125PROGNAME=$2
    126126MINIMUM_JAVA_VERSION=1.4.0_00
    127127MIN_DISPLAY_VERSION=1.4
     128if [ "x$javahome" != "x" ]; then
     129    JAVA_HOME=$javahome;
     130    try_java "$MIN_DISPLAY_VERSION"
     131    retval=$?
     132    return $retval
     133fi
    128134
    129135# sus out search4j
Note: See TracChangeset for help on using the changeset viewer.