X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=utils%2Fdownload_jres.sh;h=89ed8fc743e18f62c99efc569b530da04b593da3;hb=b160d9b1aecc3fc3d6583189a045a986ecf8f18a;hp=8b8abc36405bf87c004539187f70de41f07fb51b;hpb=a9c365d7d21a454d1befb178a4286b6cede19d20;p=jalview.git

diff --git a/utils/download_jres.sh b/utils/download_jres.sh
index 8b8abc3..89ed8fc 100755
--- a/utils/download_jres.sh
+++ b/utils/download_jres.sh
@@ -18,8 +18,13 @@ JVM_IMPL=hotspot
 HEAP_SIZE=normal
 VENDOR=adoptopenjdk
 IMAGE_TYPE=jre
+TAR=tar
+ZIP=zip
+UNZIP=unzip
 
 STRIP_MAC_APP_BUNDLING=false
+CREATE_ARCHIVES="zip tgz"
+# need zip with top-level jre dir for getdown updates. need tgz without top-level jre dir for install4j bundling
 
 RM=/bin/rm
 
@@ -27,7 +32,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"
@@ -61,10 +66,10 @@ for FEATURE_VERSION in 8 11; do
       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"
+          $TAR --strip-components=3 -C "${JREDIR}" -zxf "${TARFILE}" "*/Contents/Home"
           RET=$?
         else
-          tar --strip-components=1 -C "${JREDIR}" -zxf "${TARFILE}"
+          $TAR --strip-components=1 -C "${JREDIR}" -zxf "${TARFILE}"
           RET=$?
         fi
       fi
@@ -73,10 +78,33 @@ for FEATURE_VERSION in 8 11; do
         exit 1
       fi
       $RM "${TARFILE}"
-      echo "Creating .tar.gz for install4j bundling and updates"
-      TGZDIR=tgz
-      mkdir -p "${TGZDIR}"
-      tar -C "${JREDIR}" -zcf "${TGZDIR}/${NAME}.tar.gz" .
+      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
+      fi
     done
   done
 done