MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Use "/usr/libexec/java_home" for detecting Java on Macs

Browse Source
This commit is contained in:
Roman Shevchenko
2012-01-27 22:32:34 +04:00
parent e4d561acde
commit 21b25ed4c2
1 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bin/scripts/unix/idea.sh
+3 -10
View File
@@ -31,16 +31,9 @@ else
JDK="$JAVA_LOCATION"
fi
elif [ "$OS_TYPE" = "Darwin" ]; then
if [ -h "$JAVA_BIN_PATH" ]; then
JAVA_LOCATION=`readlink "$JAVA_BIN_PATH" | xargs dirname | xargs dirname | xargs dirname`
if [ -x "$JAVA_LOCATION/CurrentJDK/Home/bin/java" ]; then
JDK="$JAVA_LOCATION/CurrentJDK/Home"
fi
else
JAVA_LOCATION=`echo "$JAVA_BIN_PATH" | xargs dirname | xargs dirname`
if [ -f "$JAVA_LOCATION/lib/tools.jar" ]; then
JDK="$JAVA_LOCATION"
fi
JAVA_LOCATION=`/usr/libexec/java_home`
if [ -x "$JAVA_LOCATION/bin/java" ]; then
JDK="$JAVA_LOCATION"
fi
fi