Added support for FCS releases

diff --git a/debian/changelog b/debian/changelog
index c070a82437946c2dfad4bac62f73cec92ed2602c..ff7852a202f2140c5f26e2bdc85a0f43f1fc4525 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,7 +2,7 @@ java-package (0.53) UNRELEASED; urgency=low
 
   * Team upload.
   * Added support for early access releases (Closes: #721136)
-  * Added support for GA releases
+  * Added support for GA and FCS 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 944240df02d07f5d914900f46ed40739f98c4ace..ea025f49276e9ecda4169dd2884ff9eed57476de 100644 (file)
--- a/lib/oracle-jdk.sh
+++ b/lib/oracle-jdk.sh
@@ -11,22 +11,29 @@ oracle_j2sdk_detect() {
     j2se_arch=${BASH_REMATCH[4]}
     if [[ $j2se_update != "" ]]
     then
-      j2se_type="Update"
+      j2se_version_name="$j2se_release Update $j2se_update"
       j2se_version=${j2se_release}u${j2se_update}
     else
-      j2se_type=""
+      j2se_version_name="$j2se_release GA"
       j2se_version=${j2se_release}
     fi
   fi
 
   # Early Access Release (jdk-8-ea-bin-b103-linux-i586-15_aug_2013.tar.gz)
-  if [[ $archive_name =~ jdk-([0-9]+)-ea-bin-(b[0-9]+)-linux-(i586|x64|amd64).*\.(bin|tar\.gz) ]]
+  if [[ $archive_name =~ jdk-([0-9]+)(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[2]}
-    j2se_arch=${BASH_REMATCH[3]}
-    j2se_type="Early Access Release"
-    j2se_version=${j2se_release}~ea-build-${j2se_update}
+    j2se_update=${BASH_REMATCH[3]}
+    j2se_build=${BASH_REMATCH[5]}
+    j2se_arch=${BASH_REMATCH[6]}
+    if [[ $j2se_update != "" ]]
+    then
+      j2se_version_name="$j2se_release Update $j2se_update Early Access Release Build $j2se_build"
+      j2se_version=${j2se_release}u${j2se_update}~ea-build-${j2se_update}
+    else
+      j2se_version_name="$j2se_release Early Access Release Build $j2se_build"
+      j2se_version=${j2se_release}~ea-build-${j2se_update}
+    fi
   fi
 
   if [[ $j2se_release > 0 ]]
@@ -73,7 +80,7 @@ oracle_j2sdk_detect() {
 
 Detected product:
     Java(TM) Development Kit (JDK)
-    Standard Edition, Version $j2se_release $j2se_type $j2se_update
+    Standard Edition, Version $j2se_version_name
     Oracle(TM)
 EOF
     if read_yn "Is this correct [Y/n]: "; then

diff --git a/lib/oracle-jre.sh b/lib/oracle-jre.sh
index c82dc3dc13b62ed8b3736449377ff4991186e402..de5165e3ee0afcb5e298883bdde853fec43f870e 100644 (file)
--- a/lib/oracle-jre.sh
+++ b/lib/oracle-jre.sh
@@ -11,22 +11,29 @@ oracle_j2re_detect() {
     j2se_arch=${BASH_REMATCH[4]}
     if [[ $j2se_update != "" ]]
     then
-      j2se_type="Update"
+      j2se_version_name="$j2se_release Update $j2se_update"
       j2se_version=${j2se_release}u${j2se_update}
     else
-      j2se_type=""
+      j2se_version_name="$j2se_release GA"
       j2se_version=${j2se_release}
     fi
   fi
 
   # Early Access Release (jre-8-ea-bin-b103-linux-x64-15_aug_2013.tar.gz)
-  if [[ $archive_name =~ jre-([0-9]+)-ea-bin-(b[0-9]+)-linux-(i586|x64|amd64).*\.(bin|tar\.gz) ]]
+  if [[ $archive_name =~ jre-([0-9]+)(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[2]}
-    j2se_arch=${BASH_REMATCH[3]}
-    j2se_type="Early Access Release"
-    j2se_version=${j2se_release}~ea-build-${j2se_update}
+    j2se_update=${BASH_REMATCH[3]}
+    j2se_build=${BASH_REMATCH[5]}
+    j2se_arch=${BASH_REMATCH[6]}
+    if [[ $j2se_update != "" ]]
+    then
+      j2se_version_name="$j2se_release Update $j2se_update Early Access Release Build $j2se_build"
+      j2se_version=${j2se_release}u${j2se_update}~ea-build-${j2se_update}
+    else
+      j2se_version_name="$j2se_release Early Access Release Build $j2se_build"
+      j2se_version=${j2se_release}~ea-build-${j2se_update}
+    fi
   fi
 
   if [[ $j2se_release > 0 ]]
@@ -57,7 +64,7 @@ oracle_j2re_detect() {
 
 Detected product:
     Java(TM) Runtime Environment (JRE)
-    Standard Edition, Version $j2se_release $j2se_type $j2se_update
+    Standard Edition, Version $j2se_version_name
     Oracle(TM)
 EOF
     if read_yn "Is this correct [Y/n]: "; then