From 9852ca8888b613daff741b3f26fd7d3b0387b42d Mon Sep 17 00:00:00 2001 From: Pablo Ulloa Date: Wed, 27 Sep 2023 13:26:53 -0300 Subject: [java] fix version regex to support graalce jdk 21 (#701) * [java] fixed feature test scenario check * [java] support for non conentional version * Update src/java/install.sh to not include whitespaces Co-authored-by: Samruddhi Khandale * bumped patch version --------- Co-authored-by: Samruddhi Khandale --- src/java/install.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/java/install.sh') diff --git a/src/java/install.sh b/src/java/install.sh index ea43dd3..2decc31 100644 --- a/src/java/install.sh +++ b/src/java/install.sh @@ -111,13 +111,13 @@ sdk_install() { elif echo "${requested_version}" | grep -oE "${full_version_check}" > /dev/null 2>&1; then echo "${requested_version}" else - local regex="${prefix}\\K[0-9]+\\.[0-9]+\\.[0-9]+${suffix}" + local regex="${prefix}\\K[0-9]+\\.?[0-9]*\\.?[0-9]*${suffix}" local version_list=$(su ${USERNAME} -c ". \${SDKMAN_DIR}/bin/sdkman-init.sh && sdk list ${install_type} 2>&1 | grep -oP \"${regex}\" | tr -d ' ' | sort -rV") if [ "${requested_version}" = "latest" ] || [ "${requested_version}" = "current" ]; then requested_version="$(echo "${version_list}" | head -n 1)" else set +e - requested_version="$(echo "${version_list}" | grep -E -m 1 "^${requested_version//./\\.}([\\.\\s]|$)")" + requested_version="$(echo "${version_list}" | grep -E -m 1 "^${requested_version//./\\.}([\\.\\s]|-|$)")" set -e fi if [ -z "${requested_version}" ] || ! echo "${version_list}" | grep "^${requested_version//./\\.}$" > /dev/null 2>&1; then -- cgit v1.2.3