Changeset 34569 for main/trunk/greenstone3/gs3-setup.sh

Timestamp:

2020-11-26T14:15:45+13:00 (3 years ago)

Author:

kjdon

Message:

when testing on catalina, which has no java, we are setting JRE_HOME. It turns out that ant needs JAVA_HOME to be set, so we'll set JAVA_HOME to the JRE_HOME.

File:

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

main/trunk/greenstone3/gs3-setup.sh

@@ -464 +464 @@
     addtopath PATH "$JRE_HOME/bin"
 
+    # ant needs a JAVA_HOME, so set that too, to the JRE
+    export JAVA_HOME="$JRE_HOME"
+   
     BUNDLED_JRE="`pwd`/packages/jre"    
     if [[ "$JRE_HOME" = *"$BUNDLED_JRE"* ]]; then
     msg="the bundled"
     fi
-
-    echo "  - Exported JRE_HOME to $msg $JRE_HOME"
+    
+    echo "  - Exported JRE_HOME and JAVA_HOME to $msg $JRE_HOME"
   else
     export JAVA_HOME="$1"