From e203f69bc3eb0c3c77820d54821c2e71469f36d1 Mon Sep 17 00:00:00 2001
From: Brecht Van Lommel <brechtvanlommel@gmail.com>
Date: Wed, 4 Dec 2019 16:27:16 +0100
Subject: Fix macOS bundling error with latest release, increase DMG disk space
 a little

Also adds more verbose output when notarization fails.
---
 release/darwin/bundle.sh | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'release/darwin')

diff --git a/release/darwin/bundle.sh b/release/darwin/bundle.sh
index 91ce4f61d37..d1ef7a180e3 100755
--- a/release/darwin/bundle.sh
+++ b/release/darwin/bundle.sh
@@ -99,7 +99,7 @@ echo
 
 # Create the disk image.
 _directory_size=$(du -sh ${_tmp_dir} | awk -F'[^0-9]*' '$0=$1')
-_image_size=$(echo "${_directory_size}" + 200 | bc) # extra 200 need for codesign to work (why on earth?)
+_image_size=$(echo "${_directory_size}" + 400 | bc) # extra 400 need for codesign to work (why on earth?)
 
 echo
 echo -n "Creating disk image of size ${_image_size}M.."
@@ -174,10 +174,10 @@ rm "${_tmp_dmg}"
 # Notarize
 if [ ! -z "${N_USERNAME}" ] && [ ! -z "${N_PASSWORD}" ] && [ ! -z "${N_BUNDLE_ID}" ]; then
     # Send to Apple
-    echo -n "Sending ${DEST_DMG} for notarization..."
+    echo "Sending ${DEST_DMG} for notarization..."
     _tmpout=$(mktemp)
-    echo xcrun altool --notarize-app -f "${DEST_DMG}" --primary-bundle-id "${N_BUNDLE_ID}" --username "${N_USERNAME}" --password "${N_PASSWORD}"
-    xcrun altool --notarize-app -f "${DEST_DMG}" --primary-bundle-id "${N_BUNDLE_ID}" --username "${N_USERNAME}" --password "${N_PASSWORD}" >${_tmpout} 2>&1
+    echo xcrun altool --notarize-app --verbose -f "${DEST_DMG}" --primary-bundle-id "${N_BUNDLE_ID}" --username "${N_USERNAME}" --password "${N_PASSWORD}"
+    xcrun altool --notarize-app --verbose -f "${DEST_DMG}" --primary-bundle-id "${N_BUNDLE_ID}" --username "${N_USERNAME}" --password "${N_PASSWORD}" >${_tmpout} 2>&1
 
     # Parse request uuid
     _requuid=$(cat "${_tmpout}" | grep "RequestUUID" | awk '{ print $3 }')
@@ -202,6 +202,7 @@ if [ ! -z "${N_USERNAME}" ] && [ ! -z "${N_PASSWORD}" ] && [ ! -z "${N_BUNDLE_ID
             echo "Notarization in progress, waiting..."
         done
     else
+        cat ${_tmpout}
         echo "Error getting RequestUUID, notarization unsuccessful"
     fi
 else
-- 
cgit v1.2.3