Changeset 30113

Timestamp:

2015-08-20T18:04:44+12:00 (9 years ago)

Author:

ak19

Message:

Set JRE_HOME not JAVA_HOME if using the jre included packages

File:

• main/trunk/greenstone3/gs3-setup.sh (modified) (2 diffs)

main/trunk/greenstone3/gs3-setup.sh

@@ -204 +204 @@
   #otherwise manually try the hint
   elif [ -d "$HINT" ]; then
-      #found a suitible java
+      #found a suitable java
       setupJavaAt "$HINT"
 
@@ -229 +229 @@
 
 function setupJavaAt() {
-  export JAVA_HOME="$1"
-  addtopath PATH "$JAVA_HOME/bin"
-  echo "  - Exported JAVA_HOME to $JAVA_HOME"
+  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
 }