v1.4.0: updated notarize.sh to use notarytool

desktop/notarize.sh

@@ -12,6 +12,10 @@ CERT="$3"
 USER="$4"
 PASS="$5"
 
+#extracts the team ID from the certification name
+TEAM="${CERT#*(}"
+TEAM="${TEAM%)}"
+
 #first sign the naked dylib in /Contents/runtime/Contents/MacOS/libjli.dylib
 codesign --force --options runtime --timestamp --sign "$CERT" \
       --entitlements "$PLIST" "${APP}/Contents/runtime/Contents/MacOS/libjli.dylib"
@@ -49,19 +53,14 @@ codesign --deep --force --options runtime --timestamp --sign "$CERT" \
 rm -rf "${APP}".zip
 zip -r "${APP}".zip "${APP}" > /dev/null
 
-echo "Uploading to apple, this may take a minute."
+echo "Uploading to apple, this may take a few minutes:"
 
-xcrun altool -t osx -f "${APP}".zip \
-  --primary-bundle-id com.shatteredpixel.shatteredpixeldungeon.apple --notarize-app \
-  --username "$USER" \
-  --password "$PASS"
+xcrun notarytool submit "${APP}".zip \
+  --apple-id "$USER" \
+  --password "$PASS" \
+  --team-id "$TEAM" \
+  --wait
 
 rm -rf "${APP}".zip
 
-echo "Upload finished, if it worked, wait for an email and then run: xcrun stapler staple \"${APP}\""
-
-# If notarizing failed, you can run this command to get info:
-# xcrun altool --notarization-info <UUID that this script printed> \
-#  --username "$USER" \
-#  --password "$PASS"
-
+echo "Notarizing finished, if it worked, run: xcrun stapler staple \"${APP}\""