From 43a6bd294bbe6f2d10f9eb84788613a00290e5f3 Mon Sep 17 00:00:00 2001
From: Marcel Taeumel <marcel.taeumel@hpi.de>
Date: Wed, 5 Jan 2022 15:51:43 +0100
Subject: [PATCH] Minor bugfixes: there are no 32-bit macOS VMs anymore; RC VMs
 for Linux have this extra indirection, which should also be considered in AIO
 bundle

---
 prepare_bundle_aio.sh | 21 +++++++++++++++++----
 prepare_bundles.sh    |  5 ++++-
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/prepare_bundle_aio.sh b/prepare_bundle_aio.sh
index c05e5e9..ccc8507 100755
--- a/prepare_bundle_aio.sh
+++ b/prepare_bundle_aio.sh
@@ -38,19 +38,32 @@ VM_LIN_ARM_TARGET="${CONTENTS_PATH}/${VM_LIN_ARM_TARGET_NAME}"
 VM_WIN_TARGET="${CONTENTS_PATH}/${VM_WIN_TARGET_NAME}"
 # VM_WIN_ARM_TARGET="${CONTENTS_PATH}/${VM_WIN_ARM_TARGET_NAME}"
 
+VM_LIN_X86_PATH="${TMP_PATH}/${VM_LIN_X86}"
+VM_LIN_ARM_PATH="${TMP_PATH}/${VM_LIN_ARM}"
+if should_use_rc_vm; then
+  # There is an extra indirection in the OSVM builds on GitHub
+  # E.g., vm-linux/sqcogspur32linuxht/...
+  pushd ${VM_LIN_X86_PATH}
+  VM_LIN_X86_PATH="${VM_LIN_X86_PATH}/$(find * -type d | head -n 1)"
+  popd
+  pushd ${VM_LIN_ARM_PATH}
+  VM_LIN_ARM_PATH="${VM_LIN_ARM_PATH}/$(find * -type d | head -n 1)"
+  popd
+fi
+
 echo "...copying VMs into bundle..."
 if [[ "${IMAGE_BITS}" == "64" ]]; then
   cp -R "${TMP_PATH}/${VM_MAC}/Squeak.app" "${APP_PATH}" # unified binary
-  cp -R "${TMP_PATH}/${VM_LIN_X86}" "${VM_LIN_TARGET}"
-  cp -R "${TMP_PATH}/${VM_LIN_ARM}" "${VM_LIN_ARM_TARGET}"
+  cp -R "${VM_LIN_X86_PATH}" "${VM_LIN_TARGET}"
+  cp -R "${VM_LIN_ARM_PATH}" "${VM_LIN_ARM_TARGET}"
   cp -R "${TMP_PATH}/${VM_WIN_X86}" "${VM_WIN_TARGET}"
   # cp -R "${TMP_PATH}/${VM_WIN_ARM}" "${VM_WIN_ARM_TARGET}"
 else # 32-bit
   mkdir -p "${APP_PATH}" # no 32-bit macOS .app anymore
   mkdir -p "${CONTENTS_PATH}" # no 32-bit macOS .app anymore
   mkdir -p "${RESOURCES_PATH}" # no 32-bit macOS .app anymore
-  cp -R "${TMP_PATH}/${VM_LIN_X86}" "${VM_LIN_TARGET}"
-  cp -R "${TMP_PATH}/${VM_LIN_ARM}" "${VM_LIN_ARM_TARGET}"
+  cp -R "${VM_LIN_X86_PATH}" "${VM_LIN_TARGET}"
+  cp -R "${VM_LIN_ARM_PATH}" "${VM_LIN_ARM_TARGET}"
   cp -R "${TMP_PATH}/${VM_WIN_X86}" "${VM_WIN_TARGET}"
   # cp -R "${TMP_PATH}/${VM_WIN_ARM}" "${VM_WIN_ARM_TARGET}"
 fi
diff --git a/prepare_bundles.sh b/prepare_bundles.sh
index 38040b1..227d842 100755
--- a/prepare_bundles.sh
+++ b/prepare_bundles.sh
@@ -67,7 +67,10 @@ if should_use_rc_vm; then
 else
   download_and_extract_all_vms
 fi
-create_unified_vm_macOS "${TMP_PATH}/${VM_MAC}" "${TMP_PATH}/${VM_MAC_ARM}" "${TMP_PATH}/${VM_MAC_X86}"
+if is_64bit; then
+  # There are no 32-bit VMs for macOS anymore.
+  create_unified_vm_macOS "${TMP_PATH}/${VM_MAC}" "${TMP_PATH}/${VM_MAC_ARM}" "${TMP_PATH}/${VM_MAC_X86}"
+fi
 
 if should_codesign; then
   source "helpers_codesign.sh"