From 39ad5d29cb74a153d5d77f409d4f44eb1bdc25a8 Mon Sep 17 00:00:00 2001 From: Vratko Polak Date: Fri, 3 Mar 2017 16:12:10 +0100 Subject: [PATCH] Bug 7895: Fix java version regex in Karaf scripts This only fixes Karaf 3 scripts. Any idea how to reliably create .patch files for Karaf 4 scripts? Change-Id: I4e0ffae51e4ba38472195164f3ddf22e08966578 Signed-off-by: Vratko Polak --- karaf/opendaylight-karaf-resources/src/main/resources/bin/karaf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/karaf/opendaylight-karaf-resources/src/main/resources/bin/karaf b/karaf/opendaylight-karaf-resources/src/main/resources/bin/karaf index ddd8d9ed2..d4c54cb5e 100755 --- a/karaf/opendaylight-karaf-resources/src/main/resources/bin/karaf +++ b/karaf/opendaylight-karaf-resources/src/main/resources/bin/karaf @@ -247,7 +247,7 @@ detectJVM() { checkJvmVersion() { # echo "`$JAVA -version`" - VERSION=`"$JAVA" -version 2>&1 | egrep '"([0-9].[0-9]\..*[0-9]).*"' | awk '{print substr($3,2,length($3)-2)}' | awk '{print substr($1, 3, 3)}' | sed -e 's;\.;;g'` + VERSION=`"$JAVA" -version 2>&1 | egrep '"([0-9]+\.[0-9]+\..*[0-9]).*"' | awk '{print substr($3,2,length($3)-2)}' | awk '{print substr($1, 3, 3)}' | sed -e 's;\.;;g'` # echo $VERSION if [ "$VERSION" -lt "80" ]; then die "JVM must be 1.8.0 or greater" -- 2.36.6