From fbd6e53e838d3c77d689adeae19fa6de6ecc050f Mon Sep 17 00:00:00 2001 From: Bernd Eckenfels Date: Thu, 22 Jan 2015 00:54:33 +0100 Subject: [PATCH] [MNG-5686] Use /usr/libexec/java_home to find JAVA_HOME --- apache-maven/src/bin/mvn | 2 +- apache-maven/src/bin/mvnDebug | 7 +++++++ apache-maven/src/bin/mvnyjp | 7 +++++++ 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/apache-maven/src/bin/mvn b/apache-maven/src/bin/mvn index 1476eac84c..1ed3024b3f 100755 --- a/apache-maven/src/bin/mvn +++ b/apache-maven/src/bin/mvn @@ -83,7 +83,7 @@ case "`uname`" in # # Apple JDKs # - export JAVA_HOME=/usr/libexec/java_home + export JAVA_HOME=`/usr/libexec/java_home` fi ;; esac diff --git a/apache-maven/src/bin/mvnDebug b/apache-maven/src/bin/mvnDebug index 7110352826..291f81f295 100755 --- a/apache-maven/src/bin/mvnDebug +++ b/apache-maven/src/bin/mvnDebug @@ -82,6 +82,13 @@ case "`uname`" in # export JAVA_HOME=/Library/Java/JavaVirtualMachines/CurrentJDK/Contents/Home fi + + if [ -z "$JAVA_HOME" ] && [ -x "/usr/libexec/java_home" ]; then + # + # Apple JDKs + # + export JAVA_HOME=`/usr/libexec/java_home` + fi ;; esac diff --git a/apache-maven/src/bin/mvnyjp b/apache-maven/src/bin/mvnyjp index d66d354cba..faf34128fc 100755 --- a/apache-maven/src/bin/mvnyjp +++ b/apache-maven/src/bin/mvnyjp @@ -86,6 +86,13 @@ case "`uname`" in # export JAVA_HOME=/Library/Java/JavaVirtualMachines/CurrentJDK/Contents/Home fi + + if [ -z "$JAVA_HOME" ] && [ -x "/usr/libexec/java_home" ]; then + # + # Apple JDKs + # + export JAVA_HOME=`/usr/libexec/java_home` + fi ;; esac