Browse Source

Upgraded Download JDKs so it works again (had to upgrade the jdk version as the old one lead to a 404 error).
Also further enhanced handling of different 7zip versions (travis uses version 9 where even ubuntu uses 16)

MeFisto94 7 years ago
parent
commit
0da670abfa
1 changed files with 6 additions and 4 deletions
  1. 6 4
      jdks/download-jdks.sh

+ 6 - 4
jdks/download-jdks.sh

@@ -3,9 +3,9 @@
 #Author MeFisto94
 set -e # Quit on Error
 
-jdk_version="8u152"
-jdk_build_version="b16"
-jdk_hash=aa0333dd3019491ca4f6ddbe78cdb6d0
+jdk_version="8u161"
+jdk_build_version="b12"
+jdk_hash=2f38c3b165be4555a1fa6e98c45e0808
 platforms=( "linux-x64.tar.gz" "linux-i586.tar.gz" "windows-i586.exe" "windows-x64.exe" "macosx-x64.dmg" )
 
 function install_xar {
@@ -92,7 +92,9 @@ function unpack_mac_jdk {
     else # Linux
         7z x ../downloads/jdk-macosx-x64.dmg > /dev/null
         # The following seems dependent of the 7zip version. Travis on Version 9.20 extracts all partitions, where as at least version 16.02 is automatically extracting 4.hfs
-        7z x 4.hfs > /dev/null
+        if [ -f 4.hfs ]; then
+            7z x 4.hfs > /dev/null
+        fi
         #install_xar
         #./xar-1.5.2/src/xar -xf JDK*/JDK*.pkg
         7z x JDK*/JDK*.pkg  > /dev/null