From f9e0c6aa3c19f8fc5c017f8a84e203d0d50d5b7f Mon Sep 17 00:00:00 2001 From: Anil Belur Date: Thu, 10 Jan 2019 11:03:11 +1000 Subject: [PATCH] Fix version number extraction for all cases When the jobs upgrade to a later version of Java passing "openjdk11" or "openjdk10" the string substitution would only return the last char which would potentially fail to pick up the correct version of Java. This change fixes this issue to handle all cases. Change-Id: If81100bbdd116ee071c3ecdeeadc0a3016fa2a15 Signed-off-by: Anil Belur --- shell/update-java-alternatives.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/shell/update-java-alternatives.sh b/shell/update-java-alternatives.sh index 22147908..a53cc0ad 100644 --- a/shell/update-java-alternatives.sh +++ b/shell/update-java-alternatives.sh @@ -15,12 +15,12 @@ JAVA_ENV_FILE="/tmp/java.env" update-java-redhat() { - if [[ "${SET_JDK_VERSION: -2}" = "11" ]]; then + if [[ "${SET_JDK_VERSION//[a-zA-Z]/}" = "11" ]]; then export JAVA_HOME="/opt/jdk-11" - elif [[ "${SET_JDK_VERSION: -2}" = "10" ]]; then + elif [[ "${SET_JDK_VERSION//[a-zA-Z]/}" = "10" ]]; then export JAVA_HOME="/opt/jdk-10.0.2" else - export JAVA_HOME="/usr/lib/jvm/java-1.${SET_JDK_VERSION: -1}.0-openjdk" + export JAVA_HOME="/usr/lib/jvm/java-1.${SET_JDK_VERSION//[a-zA-Z]/}.0-openjdk" fi sudo /usr/sbin/alternatives --install /usr/bin/java java "${JAVA_HOME}/bin/java" 1 sudo /usr/sbin/alternatives --install /usr/bin/javac javac "${JAVA_HOME}/bin/javac" 1 -- 2.16.6