From d896bf5e631e90987197d0d7ae447f5ea044f52c Mon Sep 17 00:00:00 2001
From: Marcel Taeumel <marcel.taeumel@hpi.de>
Date: Wed, 5 Jan 2022 15:13:16 +0100
Subject: [PATCH] Also update nightly symlinks for unified macOS bundle

---
 deploy_bundles.sh | 28 +++++++++++++++++-----------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/deploy_bundles.sh b/deploy_bundles.sh
index 9546d02..d943358 100755
--- a/deploy_bundles.sh
+++ b/deploy_bundles.sh
@@ -11,8 +11,10 @@
 #    product/*.dmg
 #    IMAGE_NAME
 #    IMAGE_BITS
+#....BUNDLE_NAME_AIO
 #....BUNDLE_NAME_MAC_X86
 #....BUNDLE_NAME_MAC_ARM
+#....BUNDLE_NAME_MAC
 #....BUNDLE_NAME_LIN_X86
 #....BUNDLE_NAME_LIN_ARM
 #....BUNDLE_NAME_WIN_X86
@@ -39,16 +41,19 @@ source "helpers.sh"
 [[ -z "${IMAGE_NAME}" ]] && exit 2
 [[ -z "${IMAGE_BITS}" ]] && exit 3
 
-if is_64bit; then
-  [[ -z "${BUNDLE_NAME_LIN_X86}" ]] && exit 4
-  [[ -z "${BUNDLE_NAME_MAC_X86}" ]] && exit 5
-  [[ -z "${BUNDLE_NAME_WIN_X86}" ]] && exit 6
-  [[ -z "${BUNDLE_NAME_LIN_ARM}" ]] && exit 7
-  [[ -z "${BUNDLE_NAME_MAC_ARM}" ]] && exit 8
+if [[ "${IMAGE_BITS}" == "64" ]]; then
+  [[ -z "${BUNDLE_NAME_MAC}" ]] && exit 4
+  [[ -z "${BUNDLE_NAME_MAC_ARM}" ]] && exit 5
+  [[ -z "${BUNDLE_NAME_MAC_X86}" ]] && exit 6
+  [[ -z "${BUNDLE_NAME_LIN_X86}" ]] && exit 7
+  [[ -z "${BUNDLE_NAME_LIN_ARM}" ]] && exit 8
+  [[ -z "${BUNDLE_NAME_WIN_X86}" ]] && exit 9
+  [[ -z "${BUNDLE_NAME_AIO}" ]] && exit 10
 else
-  [[ -z "${BUNDLE_NAME_LIN_X86}" ]] && exit 9
-  [[ -z "${BUNDLE_NAME_WIN_X86}" ]] && exit 10
+  [[ -z "${BUNDLE_NAME_LIN_X86}" ]] && exit 10
   [[ -z "${BUNDLE_NAME_LIN_ARM}" ]] && exit 11
+  [[ -z "${BUNDLE_NAME_WIN_X86}" ]] && exit 12
+  [[ -z "${BUNDLE_NAME_AIO}" ]] && exit 13
 fi
 
 begin_group "...preparing deployment..."
@@ -91,19 +96,20 @@ begin_group "...updating 'latest' symlinks on server..."
 
 LATEST_PREFIX="${UPSTREAM_BASE}/nightly/Squeak-latest-${IMAGE_BITS}bit"
 SYMS_CMD="ln -f -s ${UPSTREAM_PATH}/${IMAGE_NAME}.zip ${LATEST_PREFIX}.zip"
-if is_64bit; then
+if [[ "${IMAGE_BITS}" == "64" ]]; then
   SYMS_CMD="${SYMS_CMD} && ln -f -s ${UPSTREAM_PATH}/${BUNDLE_NAME_LIN_X86}.zip ${LATEST_PREFIX}-Linux-x64.zip"
   SYMS_CMD="${SYMS_CMD} && ln -f -s ${UPSTREAM_PATH}/${BUNDLE_NAME_LIN_ARM}.zip ${LATEST_PREFIX}-Linux-ARMv8.zip"
 
   SYMS_CMD="${SYMS_CMD} && ln -f -s ${UPSTREAM_PATH}/${BUNDLE_NAME_MAC_X86}.dmg ${LATEST_PREFIX}-macOS-x64.dmg"
   SYMS_CMD="${SYMS_CMD} && ln -f -s ${UPSTREAM_PATH}/${BUNDLE_NAME_MAC_ARM}.dmg ${LATEST_PREFIX}-macOS-ARMv8.dmg"
+  SYMS_CMD="${SYMS_CMD} && ln -f -s ${UPSTREAM_PATH}/${BUNDLE_NAME_MAC}.dmg ${LATEST_PREFIX}-macOS.dmg"
 
-  SYMS_CMD="${SYMS_CMD} && ln -f -s ${UPSTREAM_PATH}/${BUNDLE_NAME_WIN_X86}.zip ${LATEST_PREFIX}-Windows.zip"
+  SYMS_CMD="${SYMS_CMD} && ln -f -s ${UPSTREAM_PATH}/${BUNDLE_NAME_WIN_X86}.zip ${LATEST_PREFIX}-Windows-x64.zip"
 else
   SYMS_CMD="${SYMS_CMD} && ln -f -s ${UPSTREAM_PATH}/${BUNDLE_NAME_LIN_X86}.zip ${LATEST_PREFIX}-Linux-x86.zip"
   SYMS_CMD="${SYMS_CMD} && ln -f -s ${UPSTREAM_PATH}/${BUNDLE_NAME_LIN_ARM}.zip ${LATEST_PREFIX}-Linux-ARMv6.zip"
 
-  SYMS_CMD="${SYMS_CMD} && ln -f -s ${UPSTREAM_PATH}/${BUNDLE_NAME_WIN_X86}.zip ${LATEST_PREFIX}-Windows.zip"
+  SYMS_CMD="${SYMS_CMD} && ln -f -s ${UPSTREAM_PATH}/${BUNDLE_NAME_WIN_X86}.zip ${LATEST_PREFIX}-Windows-x86.zip"
 fi
 ssh -o ProxyCommand="ssh -l ${PROXY_USER} -i ${SSH_KEY_FILEPATH} -p ${PROXY_PORT} -W %h:%p ${PROXY_HOST}" \
   -l "${UPSTREAM_USER}" -i "${SSH_KEY_FILEPATH}" "${UPSTREAM_HOST}" -t "${SYMS_CMD}"