From 97fb9594dca740e48b1bf2d9205f960fc07b0f95 Mon Sep 17 00:00:00 2001 From: Lance Fetters Date: Fri, 9 May 2025 13:25:00 +0100 Subject: [PATCH] Support BSD version of sed in java version check Previously, the `check_java_version` function used a regular expression that worked with GNU sed, but failed with BSD sed. This change uses an extended regular expression that works with both sed flavors. --- resources/ffdec.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/resources/ffdec.sh b/resources/ffdec.sh index de3fdc7f3..181f8049b 100644 --- a/resources/ffdec.sh +++ b/resources/ffdec.sh @@ -39,10 +39,10 @@ search_jar_file() { } check_java_version () { - JVER1=$(echo $JAVA_VERSION_OUTPUT | sed 's/java version "\([0-9]*\)\.[0-9]*\.[0-9]*\(_[0-9]*\)\?".*/\1/') - JVER2=$(echo $JAVA_VERSION_OUTPUT | sed 's/java version "[0-9]*\.\([0-9]*\)\.[0-9]*\(_[0-9]*\)\?".*/\1/') - JVER3=$(echo $JAVA_VERSION_OUTPUT | sed 's/java version "[0-9]*\.[0-9]*\.\([0-9]*\)\(_[0-9]*\)\?".*/\1/') - JVER4=$(echo $JAVA_VERSION_OUTPUT | sed 's/java version "[0-9]*\.[0-9]*\.[0-9]*\(_\([0-9]*\)\)\?".*/\2/' | sed 's/^$/0/') + JVER1=$(echo $JAVA_VERSION_OUTPUT | sed -E 's/java version "([0-9]*)\.[0-9]*\.[0-9]*(_[0-9]*)?".*/\1/') + JVER2=$(echo $JAVA_VERSION_OUTPUT | sed -E 's/java version "[0-9]*\.([0-9]*)\.[0-9]*(_[0-9]*)?".*/\1/') + JVER3=$(echo $JAVA_VERSION_OUTPUT | sed -E 's/java version "[0-9]*\.[0-9]*\.([0-9]*)(_[0-9]*)?".*/\1/') + JVER4=$(echo $JAVA_VERSION_OUTPUT | sed -E 's/java version "[0-9]*\.[0-9]*\.[0-9]*(_([0-9]*))?".*/\2/' | sed 's/^$/0/') if [ "$JVER1" -gt $REQ_JVER1 ]; then return 0