SONARPLUGINS-1583 Fix regression

diff --git a/src/main/assembly/bin/sonar-runner.bat b/src/main/assembly/bin/sonar-runner.bat
index 10131fd42b807725ab998d34e9a8320a6d525af6..87007c0518abaf1a1409125fd42a9a2174701050 100644 (file)
--- a/src/main/assembly/bin/sonar-runner.bat
+++ b/src/main/assembly/bin/sonar-runner.bat
@@ -21,12 +21,14 @@ echo.
 goto end
 
 :OkJavaHome
-if NOT "%SONAR_RUNNER_HOME%"=="" (
-  @REM If the property has a trailing backslash, remove it
-  if %SONAR_RUNNER_HOME:~-1%==\ set SONAR_RUNNER_HOME=%SONAR_RUNNER_HOME:~0,-1%
-) else (
-  set SONAR_RUNNER_HOME=%~dp0..
-)
+if NOT "%SONAR_RUNNER_HOME%"=="" goto cleanSonarRunnerHome
+set SONAR_RUNNER_HOME=%~dp0..
+goto run
+
+:cleanSonarRunnerHome
+@REM If the property has a trailing backslash, remove it
+if %SONAR_RUNNER_HOME:~-1%==\ set SONAR_RUNNER_HOME=%SONAR_RUNNER_HOME:~0,-1%
+
 
 @REM ==== START RUN ====
 :run