Only notarize thin OSX builds.

diff --git a/platform/osx/make_dmg.sh b/platform/osx/make_dmg.sh
index f5124f2e94f1ae005da76ea33be22252dd5f1a51..587cacbf8b80e95c49ee25032947926463cca398 100644 (file)
--- a/platform/osx/make_dmg.sh
+++ b/platform/osx/make_dmg.sh
@@ -325,25 +325,31 @@ EOF
     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")
-    N=0
-    while [ 1 ]; do
-       echo "Checking up on $id"
-       status=$(xcrun altool --notarization-info $id -u $APPLE_ID -p $APPLE_PASSWORD --output-format xml | grep -C1 "<key>Status</key>" | tail -n 1 | sed -e "s/       .//g")
-       echo "Got $status"
-       if [ "$status" == "<string>success</string>" ]; then
-           break
-       fi
-       sleep 30
-       N=$((N+1))
-       if [ "$N" == "10" ]; then
-           echo "Timed out waiting for notarization"
-           exit 1
-       fi
-    done
+    # We only notarize thin builds, as if we're building universal binaries we must be on an OS
+    # sufficiently old that it can't notarize anyway
+    if [ "$TYPE" == "thin" ]; then
+
+       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")
+       N=0
+       while [ 1 ]; do
+           echo "Checking up on $id"
+           status=$(xcrun altool --notarization-info $id -u $APPLE_ID -p $APPLE_PASSWORD --output-format xml | grep -C1 "<key>Status</key>" | tail -n 1 | sed -e "s/   .//g")
+           echo "Got $status"
+           if [ "$status" == "<string>success</string>" ]; then
+               break
+           fi
+           sleep 30
+           N=$((N+1))
+           if [ "$N" == "10" ]; then
+               echo "Timed out waiting for notarization"
+               exit 1
+           fi
+       done
 
-    xcrun stapler staple "$dmg"
-    set +e
+       xcrun stapler staple "$dmg"
+       set +e
+
+    fi
 
     rm $tmp_dmg
     rm -rf $vol_name