SONARUNNER-117 If JAVA_HOME is set, use it in the sonar-runner executable

diff --git a/sonar-runner-cli/src/main/assembly/bin/sonar-runner b/sonar-runner-cli/src/main/assembly/bin/sonar-runner
index b0506e509a8eaae0f1111504333ffa65b0f88f4d..5529717187b7f018fb96e4152f1f99a5adcbedc5 100755 (executable)
--- a/sonar-runner-cli/src/main/assembly/bin/sonar-runner
+++ b/sonar-runner-cli/src/main/assembly/bin/sonar-runner
@@ -85,7 +85,13 @@ if [ ! -f "$SONAR_RUNNER_HOME/lib/sonar-runner-dist-${project.version}.jar" ] ;
   exit 1
 fi
 
-JAVA_CMD="`which java`"
+if [ -n "$JAVA_HOME" ]
+then
+  JAVA_CMD="$JAVA_HOME/bin/java"
+else
+  JAVA_CMD="`which java`"
+fi
+
 JAR_FILE="${SONAR_RUNNER_HOME}"/lib/sonar-runner-dist-${project.version}.jar
 PROJECT_HOME=`pwd`