X-Git-Url: http://git.sven.stormbind.net/?p=sven%2Fjava-package.git;a=blobdiff_plain;f=lib%2Foracle-jdk-doc.sh;h=16ca42597cdb332a2b7af032375a76dcaba30311;hp=1bcf07ffe7626aea53e2594945cac7848ff623b0;hb=96612acf73ab70b784e3ca29bbfd68f79976bced;hpb=1c05d6f0e114cff3d49a4a32348a0c154012ac1d

diff --git a/lib/oracle-jdk-doc.sh b/lib/oracle-jdk-doc.sh
index 1bcf07f..16ca425 100644
--- a/lib/oracle-jdk-doc.sh
+++ b/lib/oracle-jdk-doc.sh
@@ -1,33 +1,65 @@
 # Detect product
 oracle_j2sdk_doc_detect() {
+  j2se_release=0
 
-  if [[ $archive_name =~ jdk-([0-9]+)u([0-9]+)-apidocs\.zip ]]
+  # Update or GA release (jdk-7u25-apidocs.zip)
+  if [[ $archive_name =~ jdk-([0-9]+)(u([0-9]+))?-(apidocs|docs-all)\.zip ]]
   then
     j2se_release=${BASH_REMATCH[1]}
-    j2se_update=${BASH_REMATCH[2]}
-    j2se_version=$j2se_release.$j2se_update
-    
+    j2se_update=${BASH_REMATCH[3]}
+    if [[ $j2se_update != "" ]]
+    then
+      j2se_version_name="$j2se_release Update $j2se_update"
+      j2se_version=${j2se_release}u${j2se_update}${revision}
+    else
+      j2se_version_name="$j2se_release GA"
+      j2se_version=${j2se_release}${revision}
+    fi
+  fi
+
+  # Early Access Release (jdk-8-ea-docs-b104-all-21_aug_2013.zip)
+  if [[ $archive_name =~ jdk-([0-9]+)(u([0-9]+))?-(ea|fcs)-docs-(b[0-9]+)-all.*\.zip ]]
+  then
+    j2se_release=${BASH_REMATCH[1]}
+    j2se_update=${BASH_REMATCH[3]}
+    j2se_build=${BASH_REMATCH[5]}
+    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_build}${revision}
+    else
+      j2se_version_name="$j2se_release Early Access Release Build $j2se_build"
+      j2se_version=${j2se_release}~ea-build-${j2se_build}${revision}
+    fi
+  fi
+
+  if [[ $j2se_release > 0 ]]
+  then
     case "$j2se_release" in
     6) # JDK 6
       j2se_expected_min_size=44 #Mb
       ;;
-    *) # JDK 7 and higher
+    7) # JDK 7
       j2se_expected_min_size=290 #Mb
       ;;
+    *) # JDK 8 and higher
+      j2se_expected_min_size=320 #Mb
+      ;;
+
     esac
 
     cat << EOF
 
 Detected product:
     Java(TM) Development Kit (JDK) Documentation
-    Standard Edition, Version $j2se_release Update $j2se_update
+    Standard Edition, Version $j2se_version_name
     Oracle(TM)
 EOF
     if read_yn "Is this correct [Y/n]: "; then
       j2se_found=true
       j2se_required_space=$(( $j2se_expected_min_size * 2 + 20 ))
       j2se_vendor="oracle"
-      j2se_title="Java(TM) JDK, Standard Edition, Oracle(TM) Documentation"
+      j2se_title="Java Platform, Standard Edition $j2se_release Documentation"
 
       j2se_install=oracle_j2sdk_doc_install
       j2se_remove=oracle_j2sdk_doc_remove