Fixes some typos. Fixes AIO bundle for 32-bit, which does not contain…

… a macOS VM anymore.
squeak-smalltalk · Jan 5, 2022 · f6ade00 · f6ade00
1 parent 43a6bd2
commit f6ade00
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/helpers_bundles.sh b/helpers_bundles.sh
@@ -54,6 +54,7 @@ download_and_extract_all_vms_rc() {
 
     readonly BUNDLE_NAME_LIN_X86_SUFFIX="Linux-x64"
     readonly BUNDLE_NAME_LIN_ARM_SUFFIX="Linux-ARMv8"
+    readonly BUNDLE_NAME_MAC_SUFFIX="macOS"
     readonly BUNDLE_NAME_MAC_X86_SUFFIX="macOS-x64"
     readonly BUNDLE_NAME_MAC_ARM_SUFFIX="macOS-ARMv8"
     readonly BUNDLE_NAME_WIN_X86_SUFFIX="Windows-x64"
@@ -73,6 +74,7 @@ download_and_extract_all_vms_rc() {
 
     readonly BUNDLE_NAME_LIN_X86_SUFFIX="Linux-x86"
     readonly BUNDLE_NAME_LIN_ARM_SUFFIX="Linux-ARMv6"
+    readonly BUNDLE_NAME_MAC_SUFFIX="" # n/a for 32-bit
     readonly BUNDLE_NAME_MAC_X86_SUFFIX="" # n/a for 32-bit
     readonly BUNDLE_NAME_MAC_ARM_SUFFIX="" # n/a for 32-bit
     readonly BUNDLE_NAME_WIN_X86_SUFFIX="Windows-x86"

diff --git a/prepare_bundle_aio.sh b/prepare_bundle_aio.sh
@@ -62,6 +62,7 @@ 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
+  mkdir -p "${RESOURCES_PATH}/English.lproj/"
   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}"
@@ -125,10 +126,13 @@ rm -f "${VM_WIN_TARGET}/Squeak.ini.bak"
 # Remove .map files from $VM_WIN_TARGET
 rm -f "${VM_WIN_TARGET}/"*.map
 
-if should_codesign; then
-  do_codesign "${APP_PATH}" # *.app
-  if should_notarize; then
-    do_notarize "${APP_PATH}" # *.app
+if [[ "${IMAGE_BITS}" == "64" ]]; then
+  # No 32-bit macOS VM anymore
+  if should_codesign; then
+    do_codesign "${APP_PATH}" # *.app
+    if should_notarize; then
+      do_notarize "${APP_PATH}" # *.app
+    fi
   fi
 fi
 

diff --git a/prepare_bundle_macos.sh b/prepare_bundle_macos.sh
@@ -9,7 +9,7 @@
 ################################################################################
 
 begin_group "Creating macOS bundle for ${SMALLTALK_VERSION}..."
-BUNDLE_NAME_MAC="${IMAGE_NAME}-${VERSION_VM_MACOS}"
+BUNDLE_NAME_MAC="${IMAGE_NAME}-${VERSION_VM_MACOS}-${BUNDLE_NAME_MAC_SUFFIX}"
 export_variable "BUNDLE_NAME_MAC" "${BUNDLE_NAME_MAC}"
 BUNDLE_ID_MAC="org.squeak.$(echo ${SQUEAK_VERSION} | tr '[:upper:]' '[:lower:]')-${IMAGE_BITS}bit"
 APP_NAME="${IMAGE_NAME}.app"