diff --git a/helpers.sh b/helpers.sh index d1a998c..e0bcfc0 100644 --- a/helpers.sh +++ b/helpers.sh @@ -97,7 +97,16 @@ download_and_extract_vm() { local volume=$(hdiutil attach "${filepath}" | tail -1 | awk '{print $3}') mkdir -p "${target}" cp -R "${volume}/"* "${target}/" + echo "Extracted into ${target}/ from ${volume}/" + pushd ${volume} + ls -lisa + popd + pushd ${target} + ls -lisa + popd + diskutil unmount "${volume}" + else echo "Unknown archive format." && exit 77 fi diff --git a/helpers_bundles.sh b/helpers_bundles.sh index 48f2ab3..2396788 100644 --- a/helpers_bundles.sh +++ b/helpers_bundles.sh @@ -38,10 +38,10 @@ download_and_extract_all_vms_rc() { if is_64bit; then download_and_extract_vm "macOS (x64)" \ "${VM_RC_BASE}/${VM_RC_TAG}/squeak.cog.spur_macos64x64.dmg" \ - "${TMP_PATH}/${VM_MAC_X86}/Squeak.app" + "${TMP_PATH}/${VM_MAC_X86}" download_and_extract_vm "macOS (ARMv8)" \ "${VM_RC_BASE}/${VM_RC_TAG}/squeak.cog.spur_macos64ARMv8.dmg" \ - "${TMP_PATH}/${VM_MAC_ARM}/Squeak.app" + "${TMP_PATH}/${VM_MAC_ARM}" download_and_extract_vm "Linux (x64)" \ "${VM_RC_BASE}/${VM_RC_TAG}/squeak.cog.spur_linux64x64.tar.gz" \ "${TMP_PATH}/${VM_LIN_X86}" diff --git a/prepare_bundle_macos_x86.sh b/prepare_bundle_macos_x86.sh index ee43b19..0ed4864 100755 --- a/prepare_bundle_macos_x86.sh +++ b/prepare_bundle_macos_x86.sh @@ -25,16 +25,6 @@ else echo "Unable to locate macOS VM." && exit 1 fi -pushd "${APP_PATH}" -ls -lisa -popd -pushd "${CONTENTS_PATH}" -ls -lisa -popd -pushd "${RESOURCES_PATH}" -ls -lisa -popd - copy_resources "${RESOURCES_PATH}" echo "...merging template..."