diff options
| author | Duarte Meneses <duarte.meneses@sonarsource.com> | 2015-08-21 14:28:59 +0200 |
|---|---|---|
| committer | Duarte Meneses <duarte.meneses@sonarsource.com> | 2015-08-21 14:28:59 +0200 |
| commit | 149e5920791741c9af8ec9e277576988cb1ee949 (patch) | |
| tree | ffcc3a0593949f181fcd11773d8a5ea65741573d | |
| parent | ee770f146bac137f3d8ab1fd68b4988603568e31 (diff) | |
| download | sonar-scanner-cli-149e5920791741c9af8ec9e277576988cb1ee949.tar.gz sonar-scanner-cli-149e5920791741c9af8ec9e277576988cb1ee949.zip | |
SONARUNNER-117 If JAVA_HOME is set, use it in the sonar-runner executable
| -rwxr-xr-x | sonar-runner-cli/src/main/assembly/bin/sonar-runner | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/sonar-runner-cli/src/main/assembly/bin/sonar-runner b/sonar-runner-cli/src/main/assembly/bin/sonar-runner index b0506e5..5529717 100755 --- 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` |