From a87614986d49e2eac20bd8fa0b8df85a5419fa46 Mon Sep 17 00:00:00 2001 From: Sven Hoexter Date: Sun, 17 Dec 2017 12:10:15 +0100 Subject: [PATCH] ensure older pattern only match up to version 8 --- lib/oracle-jdk.sh | 4 ++-- lib/oracle-jre.sh | 4 ++-- lib/oracle-server-jre.sh | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/oracle-jdk.sh b/lib/oracle-jdk.sh index 2c25e25..99c6287 100644 --- a/lib/oracle-jdk.sh +++ b/lib/oracle-jdk.sh @@ -16,7 +16,7 @@ oracle_j2sdk_detect() { fi # Update or GA release (jdk-7u15-linux-i586.tar.gz) - if [[ $archive_name =~ jdk-([0-9]+)(u([0-9]+))?-linux-(i586|x64|amd64|arm-vfp-hflt)\.(bin|tar\.gz) ]] + if [[ $archive_name =~ jdk-([0-8]+)(u([0-9]+))?-linux-(i586|x64|amd64|arm-vfp-hflt)\.(bin|tar\.gz) ]] then j2se_release=${BASH_REMATCH[1]} j2se_update=${BASH_REMATCH[3]} @@ -32,7 +32,7 @@ oracle_j2sdk_detect() { fi # Early Access Release (jdk-8-ea-bin-b103-linux-i586-15_aug_2013.tar.gz) - if [[ $archive_name =~ jdk-([0-9]+)(u([0-9]+))?-(ea|fcs)(-bin)?-(b[0-9]+)-linux-(i586|x64|amd64|arm-vfp-hflt).*\.(bin|tar\.gz) ]] + if [[ $archive_name =~ jdk-([0-8]+)(u([0-9]+))?-(ea|fcs)(-bin)?-(b[0-9]+)-linux-(i586|x64|amd64|arm-vfp-hflt).*\.(bin|tar\.gz) ]] then j2se_release=${BASH_REMATCH[1]} j2se_update=${BASH_REMATCH[3]} diff --git a/lib/oracle-jre.sh b/lib/oracle-jre.sh index 4f408ff..331f7de 100644 --- a/lib/oracle-jre.sh +++ b/lib/oracle-jre.sh @@ -14,7 +14,7 @@ oracle_j2re_detect() { fi # Update or GA release (jre-7u13-linux-x64.tar.gz) - if [[ $archive_name =~ ^jre-([0-9]+)(u([0-9]+))?-linux-(i586|x64|amd64)\.(bin|tar\.gz) ]] + if [[ $archive_name =~ ^jre-([0-8]+)(u([0-9]+))?-linux-(i586|x64|amd64)\.(bin|tar\.gz) ]] then j2se_release=${BASH_REMATCH[1]} j2se_update=${BASH_REMATCH[3]} @@ -30,7 +30,7 @@ oracle_j2re_detect() { fi # Early Access Release (jre-8-ea-bin-b103-linux-x64-15_aug_2013.tar.gz) - if [[ $archive_name =~ ^jre-([0-9]+)(u([0-9]+))?-(ea|fcs)-bin-(b[0-9]+)-linux-(i586|x64|amd64).*\.(bin|tar\.gz) ]] + if [[ $archive_name =~ ^jre-([0-8]+)(u([0-9]+))?-(ea|fcs)-bin-(b[0-9]+)-linux-(i586|x64|amd64).*\.(bin|tar\.gz) ]] then j2se_release=${BASH_REMATCH[1]} j2se_update=${BASH_REMATCH[3]} diff --git a/lib/oracle-server-jre.sh b/lib/oracle-server-jre.sh index d901e31..c64abab 100644 --- a/lib/oracle-server-jre.sh +++ b/lib/oracle-server-jre.sh @@ -4,7 +4,7 @@ oracle_server_j2re_detect() { j2se_release=0 # Update or GA release (server-jre-8u74-linux-x64.tar.gz) - if [[ $archive_name =~ server-jre-([0-9]+)(u([0-9]+))?-linux-(i586|x64|amd64)\.(bin|tar\.gz) ]] + if [[ $archive_name =~ server-jre-([0-8]+)(u([0-9]+))?-linux-(i586|x64|amd64)\.(bin|tar\.gz) ]] then j2se_release=${BASH_REMATCH[1]} j2se_update=${BASH_REMATCH[3]} @@ -20,7 +20,7 @@ oracle_server_j2re_detect() { fi # Early Access Release (jre-8-ea-bin-b103-linux-x64-15_aug_2013.tar.gz) - if [[ $archive_name =~ server-jre-([0-9]+)(u([0-9]+))?-(ea|fcs)-bin-(b[0-9]+)-linux-(i586|x64|amd64).*\.(bin|tar\.gz) ]] + if [[ $archive_name =~ server-jre-([0-8]+)(u([0-9]+))?-(ea|fcs)-bin-(b[0-9]+)-linux-(i586|x64|amd64).*\.(bin|tar\.gz) ]] then j2se_release=${BASH_REMATCH[1]} j2se_update=${BASH_REMATCH[3]} -- 2.39.5