X-Git-Url: http://git.sven.stormbind.net/?p=sven%2Fjava-package.git;a=blobdiff_plain;f=lib%2Foracle-j2sdk-doc.sh;h=1bcf07ffe7626aea53e2594945cac7848ff623b0;hp=64ccb0f48cdf53c4efcea8ffade549376b9a846e;hb=96e84143de30aca040f44983e00cf4011fb794e8;hpb=e25d4d4e91a51565d5d655ba173fa891b2745b31

diff --git a/lib/oracle-j2sdk-doc.sh b/lib/oracle-j2sdk-doc.sh
index 64ccb0f..1bcf07f 100644
--- a/lib/oracle-j2sdk-doc.sh
+++ b/lib/oracle-j2sdk-doc.sh
@@ -1,44 +1,45 @@
 # Detect product
 oracle_j2sdk_doc_detect() {
-  local found=
-      case "$archive_name" in
-	"jdk-6u"[0-9][0-9]"-apidocs.zip") # SUPPORTED
-	    j2se_version=1.6.0+update${archive_name:6:2}${revision}
-	    j2se_expected_min_size=44 #Mb
-	    found=true
-	    ;;
-	"jdk-7u"[0-9]"-apidocs.zip") # SUPPORTED
-	    j2se_version=1.7.0+update${archive_name:6:1}${revision}
-	    j2se_expected_min_size=290 #Mb
-	    found=true
-	    ;;
-      esac
-  if [[ -n "$found" ]]; then
-	cat << EOF
+
+  if [[ $archive_name =~ jdk-([0-9]+)u([0-9]+)-apidocs\.zip ]]
+  then
+    j2se_release=${BASH_REMATCH[1]}
+    j2se_update=${BASH_REMATCH[2]}
+    j2se_version=$j2se_release.$j2se_update
+    
+    case "$j2se_release" in
+    6) # JDK 6
+      j2se_expected_min_size=44 #Mb
+      ;;
+    *) # JDK 7 and higher
+      j2se_expected_min_size=290 #Mb
+      ;;
+    esac
+
+    cat << EOF
 
 Detected product:
     Java(TM) Development Kit (JDK) Documentation
-    Standard Edition, Version $j2se_version
+    Standard Edition, Version $j2se_release Update $j2se_update
     Oracle(TM)
 EOF
-	if read_yn "Is this correct [Y/n]: "; then
-	    j2se_found=true
-	    j2se_release="${j2se_version:2:1}"
-	    j2se_required_space=$(( $j2se_expected_min_size * 2 + 20 ))
-	    j2se_vendor="oracle"
-	    j2se_title="Java(TM) JDK, Standard Edition, Oracle(TM) Documentation"
+    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_install=oracle_j2sdk_doc_install
-	    j2se_remove=oracle_j2sdk_doc_remove
-	    j2sdk_doc_run
-	fi
+      j2se_install=oracle_j2sdk_doc_install
+      j2se_remove=oracle_j2sdk_doc_remove
+      j2sdk_doc_run
     fi
+  fi
 }
 
 j2se_detect_j2sdk_doc_oracle=oracle_j2sdk_doc_detect
 
 oracle_j2sdk_doc_install() {
-	cat << EOF
+    cat << EOF
 if [ ! -e "$javadoc_base$j2se_name" ]; then
     exit 0
 fi
@@ -53,7 +54,7 @@ EOF
 }
 
 oracle_j2sdk_doc_remove() {
-	cat << EOF
+    cat << EOF
 if [ ! -e "$javadoc_base$j2se_name" ]; then
     exit 0
 fi