[karaf] branch main updated: KARAF-7746: Improve checkJVM function in bin/inc

[jbonofre]

This is an automated email from the ASF dual-hosted git repository.

jbonofre pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/karaf.git


The following commit(s) were added to refs/heads/main by this push:
     new d3b20d7767 KARAF-7746: Improve checkJVM function in bin/inc
     new e5da86380e Merge pull request #1762 from jbonofre/KARAF-7746
d3b20d7767 is described below

commit d3b20d77679061ecd51da5b2270f40f0d1aad840
Author: JB Onofré <j...@nanthrax.net>
AuthorDate: Mon Sep 4 16:53:53 2023 +0200

    KARAF-7746: Improve checkJVM function in bin/inc
---
 assemblies/features/base/src/main/filtered-resources/resources/bin/inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/assemblies/features/base/src/main/filtered-resources/resources/bin/inc 
b/assemblies/features/base/src/main/filtered-resources/resources/bin/inc
index bfe7c62328..f13192b41f 100644
--- a/assemblies/features/base/src/main/filtered-resources/resources/bin/inc
+++ b/assemblies/features/base/src/main/filtered-resources/resources/bin/inc
@@ -241,7 +241,7 @@ checkJvmVersion() {
         fi
     fi
 
-    VERSION=`"${JAVA}" -version 2>&1 | ${AWK} -F '"' '/version/ {print $2}' | 
sed -e 's/_.*//g; s/^1\.//g; s/\..*//g; s/-.*//g;'`
+    VERSION=`"${JAVA}" -version 2>&1 | ${AWK} -F '"' '/version/ {print $2}' | 
sed -e 's/_.*//g; s/^1\.//g; s/\..*//g; s/-.*//g;s/-.*//g; s/^[A-Za-z].*//'`
 
     # java must be at least version 8
     if [ "${VERSION}" -lt "8" ]; then