From 631599242103d2094dff07d3d619f879ae71efa0 Mon Sep 17 00:00:00 2001
From: Holger Levsen <holger@layer-acht.org>
Date: Sat, 11 May 2019 16:39:11 +0200
Subject: [PATCH] merge changes from updated package

Signed-off-by: Holger Levsen <holger@layer-acht.org>
---
 hosts/jenkins/etc/init.d/jenkins | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/hosts/jenkins/etc/init.d/jenkins b/hosts/jenkins/etc/init.d/jenkins
index 8bde1b5e7..5f483834b 100755
--- a/hosts/jenkins/etc/init.d/jenkins
+++ b/hosts/jenkins/etc/init.d/jenkins
@@ -26,8 +26,6 @@ DAEMON=/usr/bin/daemon
 DAEMON_ARGS="--name=$NAME --inherit --env=JENKINS_HOME=$JENKINS_HOME --output=$JENKINS_LOG --pidfile=$PIDFILE"
 JAVA=`type -p java`
 
-JAVA_ALLOWED_VERSION="18"
-
 if [ -n "$UMASK" ]; then
     DAEMON_ARGS="$DAEMON_ARGS --umask=$UMASK"
 fi
@@ -56,10 +54,12 @@ if [ -z "$JAVA" ]; then
     exit 1
 fi
 
+# Which Java versions can be used to run Jenkins
+JAVA_ALLOWED_VERSIONS=( "18" "110" )
 # Work out the JAVA version we are working with:
-JAVA_VERSION=$($JAVA -version 2>&1 | sed -n ';s/.* version "\(.*\)\.\(.*\)\..*"/\1\2/p;')
+JAVA_VERSION=$($JAVA -version 2>&1 | sed -n ';s/.* version "\(.*\)\.\(.*\)\..*".*/\1\2/p;')
 
-if [ "$JAVA_VERSION" = "$JAVA_ALLOWED_VERSION" ]; then
+if [[ ${JAVA_ALLOWED_VERSIONS[*]} =~ "$JAVA_VERSION" ]]; then
     echo "Correct java version found" >&2
 else
     echo "Found an incorrect Java version" >&2
-- 
GitLab