Changeset 0839b46

Timestamp:

May 4, 2016 4:05:30 PM (5 years ago)

Author:

zzz <zzz@…>

Branches:

master

Children:

16ff3e3, 4fd0261

Parents:

cdafab27

Message:

i2prouter: Set JAVA_HOME correctly on Mac OS X 10.5 and later (ticket #1783)

File:

• installer/resources/i2prouter (modified) (1 diff)

installer/resources/i2prouter

@@ -489 +489 @@
 fi
 
-# OSX always places Java in the same location so we can reliably set JAVA_HOME
+# Through Java 6, OSX always places Java in the same location so we can reliably set JAVA_HOME
+# As of OSX 10.5 / Java 7, call /usr/libexec/java_home to find it
+# https://developer.apple.com/library/mac/qa/qa1170/_index.html
 if [ "$DIST_OS" = "macosx" ]
 then
     if [ -z "$JAVA_HOME" ]; then
-        JAVA_HOME="/Library/Java/Home"; export JAVA_HOME
+        if [ -x "/usr/libexec/java_home" ]; then
+            JAVA_HOME=`/usr/libexec/java_home`
+        fi
+        if [ -z "$JAVA_HOME" ]; then
+            JAVA_HOME="/Library/Java/Home"
+        fi
+        export JAVA_HOME
     fi
 fi