ensure older pattern only match up to version 8

[sven/java-package.git] / lib / oracle-jdk.sh

diff --git a/lib/oracle-jdk.sh b/lib/oracle-jdk.sh
index 2c25e255ddd74156ae71b3040104119140ff7856..99c6287f4b05b0b7d9f1a4b52bb79eb86cd6ba1e 100644 (file)
--- 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]}