X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=utils%2Fdownload_jdks.sh;fp=utils%2Fdownload_jdks.sh;h=cf8634ae5f33723957a0a585a1939fca99a68a9b;hb=304e64fb34b32659be1bbfd39fb4e15b2f79586e;hp=c488d80406499733fb6c6adb31c5fa11b124c27e;hpb=cfb79b69d9fa44595560659bd95d1d1cd27677ad;p=jalview.git

diff --git a/utils/download_jdks.sh b/utils/download_jdks.sh
index c488d80..cf8634a 100755
--- a/utils/download_jdks.sh
+++ b/utils/download_jdks.sh
@@ -11,12 +11,14 @@
 ### and
 ### ./tgz/jre-VERSION-OS-ARCH.tgz
 ### which is an archive of the _contents_ of ./jre-VERSION-OS-ARCH/jre/ and used by install4j for the installer
+### bs 2021-10-26
+### Edited to use adoptium domain to gain access to Java 17 (LTS) versions.
 
-BASE=https://api.adoptopenjdk.net/v3/binary/latest
+BASE=https://api.adoptium.net/v3/binary/latest
 RELEASE_TYPE=ga
 JVM_IMPL=hotspot
 HEAP_SIZE=normal
-VENDOR=adoptopenjdk
+VENDOR=eclipse
 IMAGE_TYPE=jdk
 
 RM=/bin/rm
@@ -34,40 +36,38 @@ unzip-strip() (
   fi && rmdir "$temp"/* "$temp"
 )
 
-for FEATURE_VERSION in 8 11 12 13; do
-  for OS in mac; do
-  #for OS in linux mac windows; do
-    for ARCH in x64; do
-    #for ARCH in aarch64 arm x32 x64; do
-      NAME="${IMAGE_TYPE}-${FEATURE_VERSION}-${OS}-${ARCH}"
-      TARFILE="${NAME}.tgz"
-      echo "* Downloading ${TARFILE}"
-      URL="${BASE}/${FEATURE_VERSION}/${RELEASE_TYPE}/${OS}/${ARCH}/${IMAGE_TYPE}/${JVM_IMPL}/${HEAP_SIZE}/${VENDOR}"
-      wget -q -O "${TARFILE}" "${URL}"
-      if [ "$?" != 0 ]; then
-        echo "- No ${IMAGE_TYPE}-${FEATURE_VERSION} download for ${OS}-${ARCH} '${URL}'"
-        $RM -f "${TARFILE}"
-        continue;
-      fi
-      echo "Unpacking ${TARFILE}"
-      JREDIR="${NAME}/${IMAGE_TYPE}"
-      [ x$NAME != x -a -e "${JREDIR}" ] && $RM -rf "${JREDIR}"
-      mkdir -p "${JREDIR}"
-      if [ x$OS = xwindows ]; then
-        echo "using unzip"
-        unzip-strip "${TARFILE}" "${JREDIR}"
-        RET=$?
-      else
-        echo "using tar"
-        tar --strip-components=1 -C "${JREDIR}" -zxf "${TARFILE}"
-        RET=$?
-      fi
-      if [ "$RET" != 0 ]; then
-        echo "Error unpacking ${TARFILE}"
-        exit 1
-      fi
-      $RM "${TARFILE}"
-    done
+for FEATURE_VERSION in 8 11 17; do
+  for OS_ARCH in mac:x64 mac:aarch64 windows:x64 linux:x64 linux:arm linux:aarch64; do
+    OS=${OS_ARCH%:*}
+    ARCH=${OS_ARCH#*:}
+    NAME="${IMAGE_TYPE}-${FEATURE_VERSION}-${OS}-${ARCH}"
+    TARFILE="${NAME}.tgz"
+    echo "* Downloading ${TARFILE}"
+    URL="${BASE}/${FEATURE_VERSION}/${RELEASE_TYPE}/${OS}/${ARCH}/${IMAGE_TYPE}/${JVM_IMPL}/${HEAP_SIZE}/${VENDOR}"
+    wget -q -O "${TARFILE}" "${URL}"
+    if [ "$?" != 0 ]; then
+      echo "- No ${IMAGE_TYPE}-${FEATURE_VERSION} download for ${OS}-${ARCH} '${URL}'"
+      $RM -f "${TARFILE}"
+      continue;
+    fi
+    echo "Unpacking ${TARFILE}"
+    JREDIR="${NAME}/${IMAGE_TYPE}"
+    [ x$NAME != x -a -e "${JREDIR}" ] && $RM -rf "${JREDIR}"
+    mkdir -p "${JREDIR}"
+    if [ x$OS = xwindows ]; then
+      echo "using unzip"
+      unzip-strip "${TARFILE}" "${JREDIR}"
+      RET=$?
+    else
+      echo "using tar"
+      tar --strip-components=1 -C "${JREDIR}" -zxf "${TARFILE}"
+      RET=$?
+    fi
+    if [ "$RET" != 0 ]; then
+      echo "Error unpacking ${TARFILE}"
+      exit 1
+    fi
+    $RM "${TARFILE}"
   done
 done