diff options
| author | David Lönnhager <david.l@mullvad.net> | 2025-05-13 14:17:45 +0200 |
|---|---|---|
| committer | David Lönnhager <david.l@mullvad.net> | 2025-05-13 14:28:05 +0200 |
| commit | 99179c293723284dc0e54006f6114b7d41be2001 (patch) | |
| tree | 44de4d88c9d666fa797352b97bf923323e701a7c | |
| parent | d36f215dd5170e50cb2c668fc9c42ae7ecaeac2c (diff) | |
| download | mullvadvpn-pack-downloader-in-zip.tar.xz mullvadvpn-pack-downloader-in-zip.zip | |
Pack macOS installer-downloader in a zip filepack-downloader-in-zip
Co-authored-by: Markus Pettersson <markus.pettersson@mullvad.net>
| -rw-r--r-- | installer-downloader/CHANGELOG.md | 4 | ||||
| -rwxr-xr-x | installer-downloader/build.sh | 19 |
2 files changed, 13 insertions, 10 deletions
diff --git a/installer-downloader/CHANGELOG.md b/installer-downloader/CHANGELOG.md index 760db3eb06..8a202c35be 100644 --- a/installer-downloader/CHANGELOG.md +++ b/installer-downloader/CHANGELOG.md @@ -21,6 +21,10 @@ Line wrap the file at 100 chars. Th ## [Unreleased] +### Changed +#### macOS +- Pack downloader in a zip file instead of disk image. + ### Fixed #### Windows - Use default font instead of Segoe Fluent Icons for back arrow. diff --git a/installer-downloader/build.sh b/installer-downloader/build.sh index 727180f2a0..e1732eb1ab 100755 --- a/installer-downloader/build.sh +++ b/installer-downloader/build.sh @@ -217,11 +217,11 @@ function sign_macos { fi } -# Build app bundle and dmg, and optionally sign it. +# Build app bundle and zip, and optionally sign it. # If `$SIGN` is false, the app bundle is only ad-hoc signed. function dist_macos_app { local app_path="$BUILD_DIR/$FILENAME.app/" - local dmg_path="$BUILD_DIR/$FILENAME.dmg" + local zip_path="$BUILD_DIR/$FILENAME.zip" # Build app bundle log_info "Building $app_path..." @@ -248,17 +248,16 @@ function dist_macos_app { fi sign_macos "$app_path" - # Pack in .dmg - log_info "Creating $dmg_path image..." - hdiutil create -volname "$FILENAME" -srcfolder "$app_path" -ov -format UDZO \ - "$dmg_path" + # Pack in .zip + log_info "Creating $zip_path..." + (cd "$BUILD_DIR"; zip -r "$zip_path" "$FILENAME.app") # Sign .dmg - sign_macos "$dmg_path" + sign_macos "$zip_path" - # Notarize .dmg + # Notarize .zip if [[ "$SIGN" != "false" ]]; then - notarize_mac "$dmg_path" + notarize_mac "$zip_path" fi # Move to dist dir @@ -266,7 +265,7 @@ function dist_macos_app { rm -rf "$DIST_DIR/$FILENAME.app/" rm -rf "$DIST_DIR/$FILENAME.dmg" mv "$app_path" "$DIST_DIR/" - mv "$dmg_path" "$DIST_DIR/" + mv "$zip_path" "$DIST_DIR/" } # Notarize and staple a file. |