Changeset 30127 for main/trunk/greenstone3

Timestamp:

2015-08-24T16:56:48+12:00 (9 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:

• main/trunk/greenstone3/gs3-setup.sh (modified) (1 diff)

main/trunk/greenstone3/gs3-setup.sh

@@ -229 +229 @@
 
 function setupJavaAt() {
-  if [[ $1 == *"/jre"* ]]; then
-    export JRE_HOME="$1"
-    addtopath PATH "$JRE_HOME/bin"
-    echo "  - Exported JRE_HOME to $JRE_HOME"
-  else
-    export JAVA_HOME="$1"
-    addtopath PATH "$JAVA_HOME/bin"
-    echo "  - Exported JAVA_HOME to $JAVA_HOME"
-  fi
+  export JAVA_HOME="$1"
+  addtopath PATH "$JAVA_HOME/bin"
+  echo "  - Exported JAVA_HOME to $JAVA_HOME"
 }