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 ddd8d9ed2783974b4bbc22d25352c48add7fd262..d4c54cb5e3e730ec0f066b481c678a47321be7b8 100755 (executable)
--- 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"