From ed70eb2db4e77d0adbc3b553e30be31b8a5c683a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ulises=20Gasc=C3=B3n?= <ulisesgascongonzalez@gmail.com>
Date: Wed, 1 Nov 2023 14:40:54 +0100
Subject: [PATCH] tools: improve macOS notarization process output readability

PR-URL: https://github.com/nodejs/node/pull/50389
Fixes: https://github.com/nodejs/build/issues/3529
Reviewed-By: Richard Lau <rlau@redhat.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
---
 tools/osx-notarize.sh | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/tools/osx-notarize.sh b/tools/osx-notarize.sh
index fbb2e4eb11ee8a..300173dd7fe0e9 100755
--- a/tools/osx-notarize.sh
+++ b/tools/osx-notarize.sh
@@ -37,22 +37,19 @@ fi
 # Submit the package for notarization
 # TODO(@ulisesGascon): refactor to use --keychain-profile
 # when https://github.com/nodejs/build/issues/3385#issuecomment-1729281269 is ready
-notarization_output=$(
-  xcrun notarytool submit \
-    --apple-id "$NOTARIZATION_ID" \
-    --password "$NOTARIZATION_PASSWORD" \
-    --team-id "$NOTARIZATION_TEAM_ID" \
-    --wait \
-    "node-$pkgid.pkg" 2>&1
-)
+echo "Submitting node-$pkgid.pkg for notarization..."
+
+xcrun notarytool submit \
+  --apple-id "$NOTARIZATION_ID" \
+  --password "$NOTARIZATION_PASSWORD" \
+  --team-id "$NOTARIZATION_TEAM_ID" \
+  --wait \
+  "node-$pkgid.pkg"
 
 if [ $? -eq 0 ]; then
-  # Extract the operation ID from the output
-  operation_id=$(echo "$notarization_output" | awk '/RequestUUID/ {print $NF}')
-  echo "Notarization submitted. Operation ID: $operation_id"
+  echo "Notarization node-$pkgid.pkg submitted successfully."
   exit 0
 else
-  echo "Notarization failed. Error: $notarization_output"
+  echo "Notarization node-$pkgid.pkg failed."
   exit 1
 fi
-