From 21b25ed4c2c1b68baf37071f55fa22c60b331d2f Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Fri, 27 Jan 2012 17:05:22 +0400
Subject: [PATCH] Use "/usr/libexec/java_home" for detecting Java on Macs

---
 bin/scripts/unix/idea.sh | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/bin/scripts/unix/idea.sh b/bin/scripts/unix/idea.sh
index e5e7382ecdb1..ec78dc4f7968 100755
--- a/bin/scripts/unix/idea.sh
+++ b/bin/scripts/unix/idea.sh
@@ -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