From: Carl Hetherington <cth@carlh.net>
Date: Mon, 21 Oct 2019 16:41:55 +0000 (+0200)
Subject: Tweak error handling in make_osx.
X-Git-Tag: v2.15.25~1
X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=231644e75f537342c3442c03a3cd5ef34bfa25ec

Tweak error handling in make_osx.
---

diff --git a/platform/osx/make_dmg.sh b/platform/osx/make_dmg.sh
index 93cbd077f..f5124f2e9 100644
--- a/platform/osx/make_dmg.sh
+++ b/platform/osx/make_dmg.sh
@@ -314,7 +314,6 @@ EOF
     chmod -Rf go-w /Volumes/"$vol_name"/"$appdir"
     sync
 
-    set -e
     hdiutil eject $device
     hdiutil convert -format UDZO $tmp_dmg -imagekey zlib-level=9 -o "$dmg"
     sips -i "$appdir/Contents/Resources/dcpomatic2.icns"
@@ -322,6 +321,8 @@ EOF
     Rez -append "$appdir/Contents/Resources/DCP-o-matic.rsrc" -o "$dmg"
     SetFile -a C "$dmg"
     xattr -c "$dmg"
+
+    set -e
     codesign --verify --verbose --sign "Developer ID Application: Carl Hetherington (R82DXSR997)" "$dmg"
 
     id=$(xcrun altool --notarize-app -t osx -f "$dmg" --primary-bundle-id $bundle_id -u $APPLE_ID -p $APPLE_PASSWORD --output-format xml | grep -C1 RequestUUID | tail -n 1 | sed -e "s/<string>//g" | sed -e "s/<\/string>//g")