adjust the expected min size for JDK 9 and prior releases

[sven/java-package.git] / lib / oracle-jdk.sh

diff --git a/lib/oracle-jdk.sh b/lib/oracle-jdk.sh
index 23ce971a87c66fa7d051982ac94d932c7c3832a6..65db77835c3583d80911167a6adb0acb63c0189b 100644 (file)
--- a/lib/oracle-jdk.sh
+++ b/lib/oracle-jdk.sh
@@ -3,6 +3,17 @@ j2se_detect_oracle_j2sdk=oracle_j2sdk_detect
 oracle_j2sdk_detect() {
   j2se_release=0
 
+  # JDK 9 GA release (jdk-9.0.1_linux-x64_bin.tar.gz)
+  if [[ $archive_name =~ jdk-9(\.([0-9]+)\.([0-9]+))?_linux-x64_bin\.tar\.gz ]]
+  then
+      j2se_release=9
+      j2se_update=${BASH_REMATCH[1]:-.0.0}
+      j2se_arch=x64
+      j2se_version_name="${j2se_release} version ${j2se_release}${j2se_update}" 
+      j2se_version=${j2se_relase}${j2se_update}${revision}
+      j2se_expected_min_size=340 #Mb
+  fi
+
   # Update or GA release (jdk-7u15-linux-i586.tar.gz)
   if [[ $archive_name =~ jdk-([0-9]+)(u([0-9]+))?-linux-(i586|x64|amd64|arm-vfp-hflt)\.(bin|tar\.gz) ]]
   then
@@ -39,7 +50,7 @@ oracle_j2sdk_detect() {
   if [[ $j2se_release > 0 ]]
   then
     j2se_priority=$((310 + $j2se_release))
-    j2se_expected_min_size=130 #Mb
+    j2se_expected_min_size=${j2se_expected_min_size:-180} #Mb  
 
     # check if the architecture matches
     let compatible=1