From da62defe13dd9ce986c91f974fc5fbc981fc7a9b Mon Sep 17 00:00:00 2001 From: Vadim Date: Tue, 13 Dec 2016 13:49:54 +0200 Subject: [PATCH] Fixes for Mac OS start script if there is no JDK only JRE --- .../src/main/scripts/browsermob-proxy | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/browsermob-dist/src/main/scripts/browsermob-proxy b/browsermob-dist/src/main/scripts/browsermob-proxy index 2683c4cef..0b437f5a0 100755 --- a/browsermob-dist/src/main/scripts/browsermob-proxy +++ b/browsermob-dist/src/main/scripts/browsermob-proxy @@ -29,14 +29,21 @@ darwin=false; case "`uname`" in CYGWIN*) cygwin=true ;; Darwin*) darwin=true - if [ -z "$JAVA_VERSION" ] ; then - JAVA_VERSION="CurrentJDK" - else - echo "Using Java version: $JAVA_VERSION" + if [ -z "$JAVA_HOME" ] ; then + JAVA_HOME=`/usr/libexec/java_home` fi if [ -z "$JAVA_HOME" ] ; then - JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/${JAVA_VERSION}/Home + JAVA_HOME=`/System/Library/Frameworks/JavaVM.framework/Versions/Current/Commands/java_home` fi + if [ -z "$JAVA_HOME" ] ; then + if [ -z "$JAVA_VERSION" ] ; then + JAVA_VERSION="CurrentJDK" + else + echo "Using Java version: $JAVA_VERSION" + fi + JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/${JAVA_VERSION}/Home + fi + JAVACMD="$JAVA_HOME/bin/java" ;; esac