From c614bdd3751a4fe1f52e7e92ec234e002cede27b Mon Sep 17 00:00:00 2001 From: Benoit Lavenier <benoit.lavenier@e-is.pro> Date: Tue, 2 Jan 2024 11:21:11 +0100 Subject: [PATCH] enh(jvm): Fix error message, when checking JAVA version --- scripts/env-global.sh | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/scripts/env-global.sh b/scripts/env-global.sh index a393dca59..aaa0e1a67 100755 --- a/scripts/env-global.sh +++ b/scripts/env-global.sh @@ -74,10 +74,12 @@ if test -d "${JAVA_HOME}"; then if test $? -ne 0 || test -z "${JAVA_VERSION}"; then echo "No Java JRE 1.8 found in machine. This is required for Android artifacts." else - JAVA_MAJOR_VERSION=$(echo ${JAVA_VERSION} | awk '{split($0, array, ".")} END{print array[1]}') - JAVA_MINOR_VERSION=$(echo ${JAVA_VERSION} | awk '{split($0, array, ".")} END{print array[2]}') - if ! test "${JAVA_MAJOR_VERSION}" -eq "11" || ! test "${JAVA_MINOR_VERSION}" -eq "0"; then - echo "ERROR: Require a Java SDK in version 11, but found ${JAVA_VERSION}. You can override your default JAVA_HOME in '.local/env.sh'." + if ! test "${JAVA_VERSION}" -eq "11"; then + JAVA_MAJOR_VERSION=$(echo ${JAVA_VERSION} | awk '{split($0, array, ".")} END{print array[1]}') + JAVA_MINOR_VERSION=$(echo ${JAVA_VERSION} | awk '{split($0, array, ".")} END{print array[2]}') + if ! test "${JAVA_MAJOR_VERSION}" -eq "11" || ! test "${JAVA_MINOR_VERSION}" -eq "0"; then + echo "ERROR: Require a Java SDK in version 11, but found ${JAVA_VERSION}. You can override your default JAVA_HOME in '.local/env.sh'." + fi fi fi fi -- GitLab