From 0839b46c8d6a595dc09562d2926ba50dac36a95d Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Wed, 4 May 2016 16:05:30 +0000
Subject: [PATCH] i2prouter: Set JAVA_HOME correctly on Mac OS X 10.5 and later
(ticket #1783)
---
installer/resources/i2prouter | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/installer/resources/i2prouter b/installer/resources/i2prouter
index 6332a36f3f..365737d899 100644
--- a/installer/resources/i2prouter
+++ b/installer/resources/i2prouter
@@ -488,11 +488,19 @@ else
esac
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
--
GitLab