Changeset 32013 for main

Timestamp:

2017-09-28T23:10:13+13:00 (7 years ago)

Author:

ak19

Message:

Suppressing confusing message on Macs when there's no system Java installed but search4j is still trying to find a (custom) java and could potentially find one.

Location:

main/trunk

Files:

• gli/findjava.sh (modified) (1 diff)
• greenstone2/findjava.sh (modified) (1 diff)
• greenstone2/setup.bash (modified) (3 diffs)

main/trunk/gli/findjava.sh

@@ -77 +77 @@
     # regardless of which Mac OS we're on. Tested on Maverick, Lion, Leopard
     # (run `/usr/libexec/java_home -v 1.7` to find a specific version)
-    HINT=`/usr/libexec/java_home`
+
+    # run silently in case no system java installed, as it will result in a confusing message about there being no java
+    # when we're still searching for java 
+    macHINT=`/usr/libexec/java_home 2>&1`
+    #HINT=/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Home
+        #/System/Library/Frameworks/JavaVM.framework/Home
+    status=$?
+        # if no java installed, then HINT will contain:
+        #  Unable to find any JVMs matching version "(null)".
+        #  No Java runtime present, try --request to install.
+        # and the status of running /usr/libexec/java_home will not be 0 but 1:
+    if [ "$status" = "0" ]; then
+        HINT=$macHINT
+        else
+        echo "No system Java on this mac..."
+    fi
     fi
     

main/trunk/greenstone2/findjava.sh

@@ -77 +77 @@
     # regardless of which Mac OS we're on. Tested on Maverick, Lion, Leopard
     # (run `/usr/libexec/java_home -v 1.7` to find a specific version)
-    HINT=`/usr/libexec/java_home`
+
+    # run silently in case no system java installed, as it will result in a confusing message about there being no java
+    # when we're still searching for java 
+    macHINT=`/usr/libexec/java_home 2>&1`
     #HINT=/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Home
         #/System/Library/Frameworks/JavaVM.framework/Home
+    status=$?
+        # if no java installed, then HINT will contain:
+        #  Unable to find any JVMs matching version "(null)".
+        #  No Java runtime present, try --request to install.
+        # and the status of running /usr/libexec/java_home will not be 0 but 1:
+    if [ "$status" = "0" ]; then
+        HINT=$macHINT
+        else
+        echo "No system Java on this mac..."
+    fi
+
     fi
     

main/trunk/greenstone2/setup.bash

@@ -316 +316 @@
         # we can't use boolean operator -a to do the AND, since it doesn't "short-circuit" if the first test fails
         # see http://www.tldp.org/LDP/abs/html/comparison-ops.html
+
+
     if [ "x$GSDLOS" = "xdarwin" ] && [ ! -d "$HINT" ]; then
            # http://java.dzone.com/articles/java-findingsetting
@@ -321 +323 @@
        # regardless of which Mac OS we're on. Tested on Maverick, Lion, Leopard
        # (run `/usr/libexec/java_home -v 1.7` to find a specific version)
-        HINT=`/usr/libexec/java_home`
+        macHINT=`/usr/libexec/java_home 2>&1`
+        status=$?
+        # if no java installed, then HINT will contain:
+        #  Unable to find any JVMs matching version "(null)".
+        #  No Java runtime present, try --request to install.
+        # and the status of running /usr/libexec/java_home will not be 0 but 1:
+        if [ "$status" = "0" ]; then
+        HINT=$macHINT
+        else
+        echo "No system Java on this mac..."
+        fi
     fi
     
@@ -331 +343 @@
         echo "Set JAVA_HOME or JRE_HOME, and put it on the PATH, if working with Java tools like Lucene."
     elif [[ "x$javahome" != "x" && "x$javahome" != "x$BUNDLED_JRE" ]]; then
+            echo "Using Java found at $javahome" 
         if [ "x$JAVA_HOME" = "x" ]; then
         # if Java env vars not already set, then set them to the $javahome found