Chore: Upgrade Jenkins-job-builder to 6.3.0

[releng/global-jjb.git] / shell / cmake-sonarqube.sh

diff --git a/shell/cmake-sonarqube.sh b/shell/cmake-sonarqube.sh
index 1662e33..d335419 100644 (file)
--- a/shell/cmake-sonarqube.sh
+++ b/shell/cmake-sonarqube.sh
@@ -26,9 +26,11 @@ unzip -q bw.zip
 sudo mv build-wrapper-* /opt/build-wrapper
 
 
-SET_JDK_VERSION="${SET_JDK_VERSION:-openjdk11}"
+export SET_JDK_VERSION="${SET_JDK_VERSION:-openjdk11}"
 echo "$SET_JDK_VERSION"
-bash <(curl -s https://raw.githubusercontent.com/lfit/releng-global-jjb/master/shell/update-java-alternatives.sh)
+GITHUB_RAW_BASE_URL="https://raw.githubusercontent.com"
+GITHUB_FILE="lfit/releng-global-jjb/master/shell/update-java-alternatives.sh"
+bash <(curl -s "${GITHUB_RAW_BASE_URL}/${GITHUB_FILE}")
 # shellcheck disable=SC1091
 source /tmp/java.env
 
@@ -41,6 +43,7 @@ eval cmake -DCMAKE_INSTALL_PREFIX="$INSTALL_PREFIX" $cmake_opts ..
 
 # $make_opts may be empty.
 # shellcheck disable=SC2086
-/opt/build-wrapper/build-wrapper-linux-x86-64 --out-dir "$build_wrap_dir" make $make_opts
+/opt/build-wrapper/build-wrapper-linux-x86-64 --out-dir "$build_wrap_dir" \
+    make $make_opts
 
 echo "---> cmake-sonarqube.sh ends"