From 969fe2931a113706ddd06888213c8f71f546d325 Mon Sep 17 00:00:00 2001 From: Ben Soares Date: Wed, 22 Feb 2023 14:04:03 +0000 Subject: [PATCH] JAL-4064 JAL-4054 Corrected the tgz top-level dir from './Contents' to 'Contents' for mac JRE bundles for install4j (not strictly used, but might be in the future). --- utils/download_jres.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/utils/download_jres.sh b/utils/download_jres.sh index c1a5a0d..5b8b30d 100755 --- a/utils/download_jres.sh +++ b/utils/download_jres.sh @@ -147,7 +147,12 @@ for FEATURE_VERSION in 8 11 17; do EXT=tar.gz echo "Creating ${NAME}.${EXT} for install4j bundling" [ \! -d ${ARCHIVEDIR} ] && mkdir -p "${ARCHIVEDIR}" - $TAR -C "${JREDIR}" -zcf "${ARCHIVEDIR}/${NAME}.${EXT}" . + if [ x$OS = xmac ]; then + # install4j requires top level folder of "Contents" NOT "./Contents" + $TAR -C "${JREDIR}" -zcf "${ARCHIVEDIR}/${NAME}.${EXT}" Contents + else + $TAR -C "${JREDIR}" -zcf "${ARCHIVEDIR}/${NAME}.${EXT}" . + fi # make symbolic link with _ instead of - for install4j9 NEWNAME=${NAME//-/_} echo "Linking from ${NEWNAME}.${EXT} for install4j9" -- 1.7.10.2