IDEA-75407 (recognize Mac JDK 1.7 preview release)

This commit is contained in:
Roman Shevchenko
2011-10-12 21:01:21 +02:00
parent a1786a1bb0
commit 5da05faf39
+10 -3
View File
@@ -23,9 +23,16 @@ if [ -z "$JDK" ]; then
JAVA_BIN_PATH=`which java`
if [ -n "$JAVA_BIN_PATH" ]; then
if [ "$OS_TYPE" = "MAC" ]; 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"
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
fi
else
JAVA_LOCATION=`readlink -f "$JAVA_BIN_PATH"`