Changeset 30127


Ignore:
Timestamp:
2015-08-24T16:56:48+12:00 (6 years ago)
Author:
ak19
Message:

No longer setting JRE_HOME but returning the code back to setting JAVA_HOME alone, even when using the bundled JRE, since the test Yosemite (which did not have Java installed) was not happy running gs3-server with only JRE_HOME set: packages/ant/bin/ant expected JAVA_HOME to be set. So now the code does once more what it used to do and which worked on linux when a JRE was included, which is to set JAVA_HOME to the JRE instead (and not set JRE_HOME). Tested on a Yosemite without a Java (JDK or JRE), and it works.

File:
1 edited

Legend:

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

    r30113 r30127  
    229229
    230230function setupJavaAt() {
    231   if [[ $1 == *"/jre"* ]]; then
    232     export JRE_HOME="$1"
    233     addtopath PATH "$JRE_HOME/bin"
    234     echo "  - Exported JRE_HOME to $JRE_HOME"
    235   else
    236     export JAVA_HOME="$1"
    237     addtopath PATH "$JAVA_HOME/bin"
    238     echo "  - Exported JAVA_HOME to $JAVA_HOME"
    239   fi
     231  export JAVA_HOME="$1"
     232  addtopath PATH "$JAVA_HOME/bin"
     233  echo "  - Exported JAVA_HOME to $JAVA_HOME"
    240234}
    241235
Note: See TracChangeset for help on using the changeset viewer.