SONARPLUGINS-2044 Check if SONAR_RUNNER_HOME is correctly set

diff --git a/src/main/assembly/bin/sonar-runner b/src/main/assembly/bin/sonar-runner
index 42e7cc5fde0d2cdab055f9c926224ca998893c54..a9c4a751bc7f71c9f20002502b91e4f083fc670c 100755 (executable)
--- a/src/main/assembly/bin/sonar-runner
+++ b/src/main/assembly/bin/sonar-runner
@@ -13,6 +13,12 @@ if [ -z "$SONAR_RUNNER_HOME" ] ; then
 
   # make it fully qualified
   SONAR_RUNNER_HOME=`cd "$SONAR_RUNNER_HOME" && pwd`
+else
+  # check that the SONAR_RUNNER_HOME has been correctly set
+  if [ ! -e "$SONAR_RUNNER_HOME/lib/sonar-runner.jar" ] ; then
+    echo '$SONAR_RUNNER_HOME' does not point to a valid installation directory: $SONAR_RUNNER_HOME
+    exit 0
+  fi
 fi
 
 JAVA_CMD="`which java`"

diff --git a/src/main/assembly/bin/sonar-runner.bat b/src/main/assembly/bin/sonar-runner.bat
index e75cf9153512cf63aecfae166f09ee5c7482d708..4896fddb8ca15e3f867fa76a39b453d308f64ee2 100644 (file)
--- a/src/main/assembly/bin/sonar-runner.bat
+++ b/src/main/assembly/bin/sonar-runner.bat
@@ -11,15 +11,15 @@
 
 
 @REM ==== START VALIDATION ====
-@REM => JAVA EXEC
+@REM *** JAVA EXEC VALIDATION ***
 if not "%JAVA_HOME%" == "" goto foundJavaHome
 
 for %%i in (java.exe) do set JAVA_EXEC=%%~$PATH:i
 
-if not "%JAVA_EXEC%" == "" {
+if not "%JAVA_EXEC%" == "" (
   set JAVA_EXEC="%JAVA_EXEC%"
   goto OkJava
-}
+)
 
 if not "%JAVA_EXEC%" == "" goto OkJava
 
@@ -43,16 +43,25 @@ goto end
 :foundJavaExeFromJavaHome
 set JAVA_EXEC="%JAVA_HOME%\bin\java.exe"
 
+@REM *** SONAR RUNNER HOME VALIDATION ***
 :OkJava
 if NOT "%SONAR_RUNNER_HOME%"=="" goto cleanSonarRunnerHome
 set SONAR_RUNNER_HOME=%~dp0..
 goto run
 
-@REM => SONAR_RUNNER_HOME
 :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 Check if the provided SONAR_RUNNER_HOME is a valid install dir
+IF EXIST "%SONAR_RUNNER_HOME%\lib\sonar-runner.jar" goto run
+
+echo.
+echo ERROR: SONAR_RUNNER_HOME exists but does not point to a valid install
+echo        directory: %SONAR_RUNNER_HOME%
+echo.
+goto end
+
 
 
 @REM ==== START RUN ====