X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=utils%2Fdownload_jres.sh;fp=utils%2Finstall4j%2Fdownload_jres.sh;h=8b8abc36405bf87c004539187f70de41f07fb51b;hb=a9c365d7d21a454d1befb178a4286b6cede19d20;hp=0a1cf9fd675ef8a9f01e5015ad492fd17b81bd0c;hpb=1655b4dd264bcc756d2d08cfe786dd64d75e7d06;p=jalview.git

diff --git a/utils/install4j/download_jres.sh b/utils/download_jres.sh
similarity index 87%
rename from utils/install4j/download_jres.sh
rename to utils/download_jres.sh
index 0a1cf9f..8b8abc3 100755
--- a/utils/install4j/download_jres.sh
+++ b/utils/download_jres.sh
@@ -19,6 +19,8 @@ HEAP_SIZE=normal
 VENDOR=adoptopenjdk
 IMAGE_TYPE=jre
 
+STRIP_MAC_APP_BUNDLING=false
+
 RM=/bin/rm
 
 # unzip-strip from https://superuser.com/questions/518347/equivalent-to-tars-strip-components-1-in-unzip
@@ -49,7 +51,7 @@ for FEATURE_VERSION in 8 11; do
         continue;
       fi
       echo "Unpacking ${TARFILE}"
-      JREDIR="${NAME}/jre"
+      JREDIR="${NAME}/${IMAGE_TYPE}"
       [ x$NAME != x -a -e "${JREDIR}" ] && $RM -rf "${JREDIR}"
       mkdir -p "${JREDIR}"
       if [ x$OS = xwindows ]; then
@@ -58,8 +60,13 @@ for FEATURE_VERSION in 8 11; do
         RET=$?
       else
         echo "using tar"
-        tar --strip-components=1 -C "${JREDIR}" -zxf "${TARFILE}"
-        RET=$?
+        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}"