marek/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
zzz
2016-05-04 16:05:30 +00:00
parent cdafab2734
commit 0839b46c8d
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
installer/resources/i2prouter
View File

@ -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