From 95683f32ccf497631a53ba6ae2de364bd446734b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vincent=20Membr=C3=A9?= <vincent.membre@normation.com>
Date: Fri, 21 Sep 2018 11:49:00 +0200
Subject: [PATCH] Fixes #13552: rudder-jetty cannot extract java version on
 sles15

---
 rudder-jetty/SOURCES/rudder-jetty.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rudder-jetty/SOURCES/rudder-jetty.conf b/rudder-jetty/SOURCES/rudder-jetty.conf
index 235795b25..de56fed9a 100644
--- 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}."