From 9a77874b8d78e2c779d58d139e8fc30ae493974e Mon Sep 17 00:00:00 2001 From: Alex Ott Date: Sat, 2 May 2020 18:28:00 +0200 Subject: [PATCH] [HotFix] Fix Java version check on MacOS on MacOS, `[0-9]\+` doesn't work, so it was replaced with `[0-9][0-9]*` --- bin/common.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/common.sh b/bin/common.sh index eb959e155bb..d9cb81298a8 100644 --- a/bin/common.sh +++ b/bin/common.sh @@ -65,9 +65,9 @@ ZEPPELIN_CLASSPATH+=":${ZEPPELIN_CONF_DIR}" function check_java_version() { java_ver_output=$("${JAVA:-java}" -version 2>&1) jvmver=$(echo "$java_ver_output" | grep '[openjdk|java] version' | awk -F'"' 'NR==1 {print $2}' | cut -d\- -f1) - JVM_VERSION=$(echo "$jvmver"|sed -e 's|^\([0-9]\+\)\..*$|\1|') + JVM_VERSION=$(echo "$jvmver"|sed -e 's|^\([0-9][0-9]*\)\..*$|\1|') if [ "$JVM_VERSION" = "1" ]; then - JVM_VERSION=$(echo "$jvmver"|sed -e 's|^1\.\([0-9]\+\)\..*$|\1|') + JVM_VERSION=$(echo "$jvmver"|sed -e 's|^1\.\([0-9][0-9]*\)\..*$|\1|') fi if [ "$JVM_VERSION" -lt 8 ] || ([ "$JVM_VERSION" -eq 8 ] && [ "${jvmver#*_}" -lt 151 ]) ; then