Merge Apple notarisation fixes

This is still not ideal the logic to detect a successful submit appears broken so is currently disabled.
AiraYumi · Apr 5, 2024 · eb863e8 · eb863e8
2 parents 2ede549 + fda3fef
commit eb863e8
Showing 1 changed file with 10 additions and 9 deletions.
diff --git a/indra/newview/installers/darwin/apple-notarize.sh b/indra/newview/installers/darwin/apple-notarize.sh
@@ -18,22 +18,23 @@ if [[ -f "$CONFIG_FILE" ]]; then
         res=$(xcrun notarytool submit "$zip_file" \
                                 --apple-id $USERNAME \
                                 --password $PASSWORD \
-                                --verbose \
+                                --team-id $ASC_PROVIDER \
                                 --wait 2>&1)
         echo "Notarytool submit:"
         echo $res
 
         [[ "$res" =~ 'id: '([^[:space:]]+) ]]
         match=$?
+        echo "Notarized with id: [$match]"
 
-        if [[ ! $match -eq 0 ]]; then
-            echo "Running Stapler"
-            xcrun stapler staple "$app_file"
-            exit 0
-        else
-            echo "Notarization error"
-            exit 1
-        fi
+        # if [[ ! $match -eq 0 ]]; then
+        echo "Running Stapler"
+        xcrun stapler staple "$app_file"
+        exit 0
+        # else
+            # echo "Notarization error"
+            # exit 1
+        # fi
     else
         echo "Notarization error: ditto failed"
         exit 1