Skip to content

Commit c87fa1b

Browse files
Improve setup script to check JVM from path if JAVA_HOME is unset (#8702)
* setup.sh should check for JAVA_HOME if version is not 1.8 Signed-off-by: Maciej Obuchowski <[email protected]> * fix(tool): Fix jvm from path --------- Signed-off-by: Maciej Obuchowski <[email protected]> Co-authored-by: Bruce Bujon <[email protected]>
1 parent b445667 commit c87fa1b

File tree

1 file changed

+11
-1
lines changed

1 file changed

+11
-1
lines changed

setup.sh

+11-1
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,19 @@ function check-jvm() {
1818
fi
1919
}
2020

21-
echo "ℹ️ Checking required JVM:"
21+
function check-jvm-from-path() {
22+
local EXPECTED_JAVA_VERSION=$1
23+
if java -version 2>&1 | grep version | grep -q -v "version \"$EXPECTED_JAVA_VERSION"; then
24+
echo "❌ The java command from path is not $EXPECTED_JAVA_VERSION. Please set JAVA_HOME environment varible to a JDK $EXPECTED_JAVA_VERSION." >&2
25+
exit 1
26+
fi
27+
}
28+
29+
echo "ℹ️ Checking required JVMs:"
2230
if [ -e "$JAVA_HOME" ]; then
2331
check-jvm "JAVA_HOME" "1.8"
32+
elif command -v java &> /dev/null; then
33+
check-jvm-from-path "1.8"
2434
fi
2535
check-jvm "JAVA_8_HOME" "1.8"
2636
check-jvm "JAVA_11_HOME" "11"

0 commit comments

Comments
 (0)