Changeset 32013 for main/trunk

Show
Ignore:
Timestamp:
28.09.2017 23:10:13 (2 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:
3 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/gli/findjava.sh

    r30128 r32013  
    7777    # regardless of which Mac OS we're on. Tested on Maverick, Lion, Leopard 
    7878    # (run `/usr/libexec/java_home -v 1.7` to find a specific version) 
    79     HINT=`/usr/libexec/java_home` 
     79 
     80    # run silently in case no system java installed, as it will result in a confusing message about there being no java 
     81    # when we're still searching for java  
     82    macHINT=`/usr/libexec/java_home 2>&1` 
     83    #HINT=/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Home 
     84        #/System/Library/Frameworks/JavaVM.framework/Home 
     85    status=$? 
     86        # if no java installed, then HINT will contain: 
     87        #  Unable to find any JVMs matching version "(null)". 
     88        #  No Java runtime present, try --request to install. 
     89        # and the status of running /usr/libexec/java_home will not be 0 but 1: 
     90    if [ "$status" = "0" ]; then 
     91        HINT=$macHINT 
     92        else 
     93        echo "No system Java on this mac..." 
     94    fi 
    8095    fi 
    8196     
  • main/trunk/greenstone2/findjava.sh

    r30128 r32013  
    7777    # regardless of which Mac OS we're on. Tested on Maverick, Lion, Leopard 
    7878    # (run `/usr/libexec/java_home -v 1.7` to find a specific version) 
    79     HINT=`/usr/libexec/java_home` 
     79 
     80    # run silently in case no system java installed, as it will result in a confusing message about there being no java 
     81    # when we're still searching for java  
     82    macHINT=`/usr/libexec/java_home 2>&1` 
    8083    #HINT=/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Home 
    8184        #/System/Library/Frameworks/JavaVM.framework/Home 
     85    status=$? 
     86        # if no java installed, then HINT will contain: 
     87        #  Unable to find any JVMs matching version "(null)". 
     88        #  No Java runtime present, try --request to install. 
     89        # and the status of running /usr/libexec/java_home will not be 0 but 1: 
     90    if [ "$status" = "0" ]; then 
     91        HINT=$macHINT 
     92        else 
     93        echo "No system Java on this mac..." 
     94    fi 
     95 
    8296    fi 
    8397     
  • main/trunk/greenstone2/setup.bash

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