X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=utils%2Fdownload_jres.sh;h=26442ea8a0c904a85669a57618d749054d0dacc6;hb=9276cd700c1157d058538fc4e4676c3dce16deaa;hp=5bfc26dbd51f3a536d0c1931803869884f2123c5;hpb=f87c431823c2681b6b1e71f02b47af32121a35f1;p=jalview.git

diff --git a/utils/download_jres.sh b/utils/download_jres.sh
index 5bfc26d..26442ea 100755
--- a/utils/download_jres.sh
+++ b/utils/download_jres.sh
@@ -11,13 +11,18 @@
 ### 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=jre
+TAR=tar
+ZIP=zip
+UNZIP=unzip
 
 STRIP_MAC_APP_BUNDLING=false
 CREATE_ARCHIVES="zip tgz"
@@ -29,7 +34,7 @@ RM=/bin/rm
 unzip-strip() (
   local zip=$1
   local dest=${2:-.}
-  local temp=$(mktemp -d) && unzip -qq -d "$temp" "$zip" && mkdir -p "$dest" &&
+  local temp=$(mktemp -d) && $UNZIP -qq -d "$temp" "$zip" && mkdir -p "$dest" &&
   shopt -s dotglob && local f=("$temp"/*) &&
   if (( ${#f[@]} == 1 )) && [[ -d "${f[0]}" ]] ; then
     mv "$temp"/*/* "$dest"
@@ -38,71 +43,75 @@ unzip-strip() (
   fi && rmdir "$temp"/* "$temp"
 )
 
-for FEATURE_VERSION in 8 11; do
-  for OS in linux mac windows; do
-    for ARCH in x64 x32 arm; 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}"
+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"
+      if [ x$OS = xmac -a x$STRIP_MAC_APP_BUNDLING = xtrue ]; then
+        $TAR --strip-components=3 -C "${JREDIR}" -zxf "${TARFILE}" "*/Contents/Home"
         RET=$?
       else
-        echo "using tar"
-        if [ x$OS = xmac -a x$STRIP_MAC_APP_BUNDLING = xtrue ]; then
-          tar --strip-components=3 -C "${JREDIR}" -zxf "${TARFILE}" "*/Contents/Home"
-          RET=$?
-        else
-          tar --strip-components=1 -C "${JREDIR}" -zxf "${TARFILE}"
-          RET=$?
-        fi
-      fi
-      if [ "$RET" != 0 ]; then
-        echo "Error unpacking ${TARFILE}"
-        exit 1
-      fi
-      $RM "${TARFILE}"
-      if [ \! -z "$CREATE_ARCHIVES" ]; then
-        for CREATEARCHIVE in ${CREATE_ARCHIVES}; do
-          ARCHIVEDIR=$CREATEARCHIVE
-          case $CREATEARCHIVE in
-            zip)
-              EXT=${CREATEARCHIVE}
-              echo "Creating ${NAME}.${EXT} for getdown updates"
-              [ \! -d ${ARCHIVEDIR} ] && mkdir -p "${ARCHIVEDIR}"
-              ABSARCHIVEDIR="${PWD}/$ARCHIVEDIR"
-              ZIPFILE="${ABSARCHIVEDIR}/${NAME}.${CREATEARCHIVE}"
-              [ -e "${ZIPFILE}" ] && $RM "${ZIPFILE}"
-              cd ${NAME}
-              zip -X -r "${ZIPFILE}" "${IMAGE_TYPE}"
-              cd -
-              ;;
-            tgz)
-              EXT=tar.gz
-              echo "Creating ${NAME}.${EXT} for install4j bundling"
-              [ \! -d ${ARCHIVEDIR} ] && mkdir -p "${ARCHIVEDIR}"
-              tar -C "${JREDIR}" -zcf "${ARCHIVEDIR}/${NAME}.${EXT}" .
-              ;;
-            *)
-              echo "Archiving as '${CREATEARCHIVE}' file not supported"
-              ;;
-          esac
-        done
+        $TAR --strip-components=1 -C "${JREDIR}" -zxf "${TARFILE}"
+        RET=$?
       fi
-    done
+    fi
+    if [ "$RET" != 0 ]; then
+      echo "Error unpacking ${TARFILE}"
+      exit 1
+    fi
+    $RM "${TARFILE}"
+    if [ \! -z "$CREATE_ARCHIVES" ]; then
+      for CREATEARCHIVE in ${CREATE_ARCHIVES}; do
+        ARCHIVEDIR=$CREATEARCHIVE
+        case $CREATEARCHIVE in
+          zip)
+            EXT=${CREATEARCHIVE}
+            echo "Creating ${NAME}.${EXT} for getdown updates"
+            [ \! -d ${ARCHIVEDIR} ] && mkdir -p "${ARCHIVEDIR}"
+            ABSARCHIVEDIR="${PWD}/$ARCHIVEDIR"
+            ZIPFILE="${ABSARCHIVEDIR}/${NAME}.${CREATEARCHIVE}"
+            [ -e "${ZIPFILE}" ] && $RM "${ZIPFILE}"
+            cd ${NAME}
+            $ZIP -X -r "${ZIPFILE}" "${IMAGE_TYPE}"
+            cd -
+            ;;
+          tgz)
+            EXT=tar.gz
+            echo "Creating ${NAME}.${EXT} for install4j bundling"
+            [ \! -d ${ARCHIVEDIR} ] && mkdir -p "${ARCHIVEDIR}"
+            $TAR -C "${JREDIR}" -zcf "${ARCHIVEDIR}/${NAME}.${EXT}" .
+            # make symbolic link with _ instead of - for install4j9
+            NEWNAME=${NAME//-/_}
+            echo "Linking from ${NEWNAME}.${EXT} for install4j9"
+            [ -e "${ARCHIVEDIR}/${NEWNAME}.${EXT}" ] && $RM "${ARCHIVEDIR}/${NEWNAME}.${EXT}"
+            ln -s "${NAME}.${EXT}" "${ARCHIVEDIR}/${NEWNAME}.${EXT}"
+            ;;
+          *)
+            echo "Archiving as '${CREATEARCHIVE}' file not supported"
+            ;;
+        esac
+      done
+    fi
   done
 done