Use the upstream versioning scheme (i.e 7u13 instead of 7.13) to match the convention...

diff --git a/lib/oracle-jdk-doc.sh b/lib/oracle-jdk-doc.sh
index 1bcf07ffe7626aea53e2594945cac7848ff623b0..96634deb055688983dc3b552f77da4811850347d 100644 (file)
--- a/lib/oracle-jdk-doc.sh
+++ b/lib/oracle-jdk-doc.sh
@@ -5,7 +5,7 @@ oracle_j2sdk_doc_detect() {
   then
     j2se_release=${BASH_REMATCH[1]}
     j2se_update=${BASH_REMATCH[2]}
-    j2se_version=$j2se_release.$j2se_update
+    j2se_version=${j2se_release}u${j2se_update}
     
     case "$j2se_release" in
     6) # JDK 6

diff --git a/lib/oracle-jdk.sh b/lib/oracle-jdk.sh
index 090c2cfdea185677753956b02c2abfc63d7f35b8..fecb29684d92820387131b1d10944970b5ce036c 100644 (file)
--- a/lib/oracle-jdk.sh
+++ b/lib/oracle-jdk.sh
@@ -7,7 +7,7 @@ oracle_j2sdk_detect() {
     j2se_release=${BASH_REMATCH[1]}
     j2se_update=${BASH_REMATCH[2]}
     j2se_arch=${BASH_REMATCH[3]}
-    j2se_version=$j2se_release.$j2se_update
+    j2se_version=${j2se_release}u${j2se_update}
     j2se_priority=$((310 + $j2se_release))
     j2se_expected_min_size=130 #Mb
 

diff --git a/lib/oracle-jre.sh b/lib/oracle-jre.sh
index db287cd77e8f6aaa99e55fde3e706a1f2fa15d42..04c47e6e21de163191d302d014b3be340fd8143e 100644 (file)
--- a/lib/oracle-jre.sh
+++ b/lib/oracle-jre.sh
@@ -7,7 +7,7 @@ oracle_j2re_detect() {
     j2se_release=${BASH_REMATCH[1]}
     j2se_update=${BASH_REMATCH[2]}
     j2se_arch=${BASH_REMATCH[3]}
-    j2se_version=$j2se_release.$j2se_update
+    j2se_version=${j2se_release}u${j2se_update}
     j2se_priority=$((310 + $j2se_release - 1))
     j2se_expected_min_size=85 #Mb