From 369cad26d2fb8fe6b2208fcb4b0732e1ed1a9189 Mon Sep 17 00:00:00 2001 From: Brandon Wilburn Date: Wed, 14 Sep 2016 12:51:03 -0400 Subject: [PATCH] Issue #25: Adding capability to set JAVA_HOME for jvm in use --- sonar-runner-2.4/bin/sonar-runner | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/sonar-runner-2.4/bin/sonar-runner b/sonar-runner-2.4/bin/sonar-runner index 10f8a27..59454a6 100755 --- a/sonar-runner-2.4/bin/sonar-runner +++ b/sonar-runner-2.4/bin/sonar-runner @@ -79,13 +79,18 @@ if [ -z "$SONAR_RUNNER_HOME" ] ; then SONAR_RUNNER_HOME=`cd "$SONAR_RUNNER_HOME" && pwd` fi +if [ ! -z "$JAVA_HOME" ] ; then + JAVA_CMD="$JAVA_HOME/bin/java" + else + JAVA_CMD="`which java`" +fi + # check that the SONAR_RUNNER_HOME has been correctly set if [ ! -f "$SONAR_RUNNER_HOME/lib/sonar-runner-dist-2.4.jar" ] ; then echo '$SONAR_RUNNER_HOME' does not point to a valid installation directory: $SONAR_RUNNER_HOME exit 1 fi -JAVA_CMD="`which java`" JAR_FILE="${SONAR_RUNNER_HOME}"/lib/sonar-runner-dist-2.4.jar PROJECT_HOME=`pwd`