From: Vratko Polak <vrpolak@cisco.com>
Date: Fri, 3 Mar 2017 15:12:10 +0000 (+0100)
Subject: Bug 7895: Fix java version regex in Karaf scripts
X-Git-Tag: release/carbon~31
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F70%2F52770%2F4;p=odlparent.git

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 <vrpolak@cisco.com>
---

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"