Added support for GA releases

diff --git a/debian/changelog b/debian/changelog
index 778bb8bb1e08b4a1e897a40b9cd6bf69adcbbab6..c070a82437946c2dfad4bac62f73cec92ed2602c 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ java-package (0.53) UNRELEASED; urgency=low
 
   * Team upload.
   * Added support for early access releases (Closes: #721136)
+  * Added support for GA releases
 
  -- Emmanuel Bourg <ebourg@apache.org>  Wed, 28 Aug 2013 19:34:41 +0200
 

diff --git a/lib/oracle-jdk.sh b/lib/oracle-jdk.sh
index 0f422656c90de667f8a4eac7f6780d8654cc027f..944240df02d07f5d914900f46ed40739f98c4ace 100644 (file)
--- a/lib/oracle-jdk.sh
+++ b/lib/oracle-jdk.sh
@@ -3,14 +3,20 @@ j2se_detect_oracle_j2sdk=oracle_j2sdk_detect
 oracle_j2sdk_detect() {
   j2se_release=0
 
-  # Update (jdk-7u15-linux-i586.tar.gz)
-  if [[ $archive_name =~ jdk-([0-9]+)u([0-9]+)-linux-(i586|x64|amd64)\.(bin|tar\.gz) ]]
+  # Update or GA release (jdk-7u15-linux-i586.tar.gz)
+  if [[ $archive_name =~ jdk-([0-9]+)(u([0-9]+))?-linux-(i586|x64|amd64)\.(bin|tar\.gz) ]]
   then
     j2se_release=${BASH_REMATCH[1]}
-    j2se_update=${BASH_REMATCH[2]}
-    j2se_arch=${BASH_REMATCH[3]}
-    j2se_type="Update"
-    j2se_version=${j2se_release}u${j2se_update}
+    j2se_update=${BASH_REMATCH[3]}
+    j2se_arch=${BASH_REMATCH[4]}
+    if [[ $j2se_update != "" ]]
+    then
+      j2se_type="Update"
+      j2se_version=${j2se_release}u${j2se_update}
+    else
+      j2se_type=""
+      j2se_version=${j2se_release}
+    fi
   fi
 
   # Early Access Release (jdk-8-ea-bin-b103-linux-i586-15_aug_2013.tar.gz)

diff --git a/lib/oracle-jre.sh b/lib/oracle-jre.sh
index 7bd2b66f12b3e7f7ba1e16c5eedb0a6504f84f51..c82dc3dc13b62ed8b3736449377ff4991186e402 100644 (file)
--- a/lib/oracle-jre.sh
+++ b/lib/oracle-jre.sh
@@ -3,14 +3,20 @@ j2se_detect_oracle_j2re=oracle_j2re_detect
 oracle_j2re_detect() {
   j2se_release=0
 
-  # Update (jre-7u13-linux-x64.tar.gz)
-  if [[ $archive_name =~ jre-([0-9]+)u([0-9]+)-linux-(i586|x64|amd64)\.(bin|tar\.gz) ]]
+  # 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) ]]
   then
     j2se_release=${BASH_REMATCH[1]}
-    j2se_update=${BASH_REMATCH[2]}
-    j2se_arch=${BASH_REMATCH[3]}
-    j2se_type="Update"
-    j2se_version=${j2se_release}u${j2se_update}
+    j2se_update=${BASH_REMATCH[3]}
+    j2se_arch=${BASH_REMATCH[4]}
+    if [[ $j2se_update != "" ]]
+    then
+      j2se_type="Update"
+      j2se_version=${j2se_release}u${j2se_update}
+    else
+      j2se_type=""
+      j2se_version=${j2se_release}
+    fi
   fi
 
   # Early Access Release (jre-8-ea-bin-b103-linux-x64-15_aug_2013.tar.gz)