SONAR-17136 Add SONAR_JAVA_PATH env variable support for custom JRE on MacOS

diff --git a/sonar-application/src/main/assembly/bin/macosx-universal-64/sonar.sh b/sonar-application/src/main/assembly/bin/macosx-universal-64/sonar.sh
index 2ef4624c57b12304b388e8e658e929f01df98866..e18d6cd1949cafc6de70fdcb4b819cfc5aab07ae 100755 (executable)
--- a/sonar-application/src/main/assembly/bin/macosx-universal-64/sonar.sh
+++ b/sonar-application/src/main/assembly/bin/macosx-universal-64/sonar.sh
@@ -2,8 +2,24 @@
 
 APP_NAME="SonarQube"
 
-# Java command location
-JAVA_CMD="java"
+# By default, java from the PATH is used, except if SONAR_JAVA_PATH env variable is set
+findjava() {
+  if [ -z "${SONAR_JAVA_PATH}" ]; then
+    if ! command -v java 2>&1; then
+      echo "Java not found. Please make sure that the environmental variable SONAR_JAVA_PATH points to a Java executable"
+      exit 1
+    fi
+    JAVA_CMD=java
+  else
+    if ! [ -x "${SONAR_JAVA_PATH}" ] || ! [ -f "${SONAR_JAVA_PATH}" ]; then
+      echo "File '${SONAR_JAVA_PATH}' is not executable. Please make sure that the environmental variable SONAR_JAVA_PATH points to a Java executable"
+      exit 1
+    fi
+    JAVA_CMD="${SONAR_JAVA_PATH}"
+  fi
+}
+
+findjava
 
 # Get the fully qualified path to the script
 case $0 in