Changeset 29010 for main/trunk/gli

Timestamp:

2014-04-30T15:43:40+12:00 (10 years ago)

Author:

ak19

Message:

A much simpler version to find java home (default JDK) on any Mac OS found on a website. Tested on maverick, lion, leopard

File:

• main/trunk/gli/findjava.sh (modified) (1 diff)

main/trunk/gli/findjava.sh

@@ -70 +70 @@
     HINT=`cd "$GSDLHOME";pwd`/packages/jre
     elif [ "$GSDLOS" = "darwin" ]; then
-    osversion=`uname -r | sed 's/\..*$//'`; 
-    # mac maverick is version 13
-    if [ $osversion -ge 13 ] ; then 
-        # To work out java:
-        # 1. run "which java", which for example prints /usr/bin/java
-        # 2a. then do "ls -la" on that. The result is for example
-        # lrwxr-xr-x  1 root  wheel  74 20 Jan 15:08 /usr/bin/java -> /System/Library/Frameworks/JavaVM.framework/Versions/Current/Commands/java
-        # 2b. remove everything before the symlink portion (before the "-> "), to get
-        # /System/Library/Frameworks/JavaVM.framework/Versions/Current/Commands/java
-        # 3. then suffix "_home" to it, to get
-        # /System/Library/Frameworks/JavaVM.framework/Versions/Current/Commands/java_home
-        # 4. Then run this executable, which will tell you JAVA_HOME, e.g.
-        # /System/Library/Java/JavaVirtualMachines/1.6.0.jdk/Contents/Home
-
-        whichjava=`which java`;
-        symlink=`ls -la $whichjava | sed 's/[^>]*> //'`
-        javahome=$symlink"_home"
-        HINT=`$javahome`        
-    else
-        HINT=/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Home
-        #/System/Library/Frameworks/JavaVM.framework/Home
-    fi
-
+    # http://java.dzone.com/articles/java-findingsetting
+    # explains that /usr/libexec/java_home will print the default JDK
+    # 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`
     fi