aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--pom.xml2
-rw-r--r--src/main/assembly/bin/sonar-scanner.bat6
2 files changed, 5 insertions, 3 deletions
diff --git a/pom.xml b/pom.xml
index 4f357a6..7c9340c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,7 +8,7 @@
<groupId>org.sonarsource.scanner.cli</groupId>
<artifactId>sonar-scanner-cli</artifactId>
- <version>3.0.2-SNAPSHOT</version>
+ <version>3.0.3-SNAPSHOT</version>
<packaging>jar</packaging>
<name>SonarQube Scanner</name>
<url>http://docs.sonarqube.org/display/SONAR/Analyzing+with+SonarQube+Scanner</url>
diff --git a/src/main/assembly/bin/sonar-scanner.bat b/src/main/assembly/bin/sonar-scanner.bat
index b10d8dc..337fadb 100644
--- a/src/main/assembly/bin/sonar-scanner.bat
+++ b/src/main/assembly/bin/sonar-scanner.bat
@@ -13,14 +13,16 @@ set ERROR_CODE=0
@REM set local scope for the variables with windows NT shell
@setlocal
-set SONAR_SCANNER_HOME=%~dp0..
+set "scriptdir=%~dp0"
+if #%scriptdir:~-1%# == #\# set scriptdir=%scriptdir:~0,-1%
+set "SONAR_SCANNER_HOME=%scriptdir%\.."
@REM ==== START VALIDATION ====
@REM *** JAVA EXEC VALIDATION ***
set use_embedded_jre=${use_embedded_jre}
if "%use_embedded_jre%" == "true" (
- set JAVA_HOME=%SONAR_SCANNER_HOME%\jre
+ set "JAVA_HOME=%SONAR_SCANNER_HOME%\jre"
)
if not "%JAVA_HOME%" == "" goto foundJavaHome