Fixes #13552: rudder-jetty cannot extract java version on sles15

Normation · Sep 21, 2018 · 95683f3 · 95683f3
1 parent 98d07e7
commit 95683f3
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/rudder-jetty/SOURCES/rudder-jetty.conf b/rudder-jetty/SOURCES/rudder-jetty.conf
@@ -25,7 +25,7 @@ then
 fi
 
 # Check JVM major version
-JAVA_MAJOR_VERSION=`${JAVA} -version 2>&1 | grep -E "(java|openjdk) version" | sed 's%.*version \"\([0-9]\.[0-9]\)\.[0-9].*\"%\1%'`
+JAVA_MAJOR_VERSION=`${JAVA} -version 2>&1 | grep -E "(java|openjdk) version" | sed 's%.*version "\([0-9]\+\.[0-9]\+\).*%\1%'`
 
 if [ `ver ${JAVA_MAJOR_VERSION}` -lt `ver 1.8` ]; then
   echo "Rudder requires Java 8 or later. Your version of Java (detected as ${JAVA}) is ${JAVA_MAJOR_VERSION}."