From 611beff7caaa788af5df85b9cc5a0bc2aac18a6f Mon Sep 17 00:00:00 2001
From: FriwiDev <friwidev@gmail.com>
Date: Tue, 1 Nov 2022 05:28:56 +0100
Subject: [PATCH] Show notarytool logs

---
 compile_macosx.sh  |  6 ------
 macosx_codesign.sh |  3 +++
 macosx_notarize.sh | 13 ++++++++++++-
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/compile_macosx.sh b/compile_macosx.sh
index 502e13d..c36eda4 100755
--- a/compile_macosx.sh
+++ b/compile_macosx.sh
@@ -44,12 +44,6 @@ else
     echo "Found existing files to build"
     cd jcef
 fi
-if [ ! -d "out" ]; then
-    mkdir out
-fi
-if [ ! -d "out/docs" ]; then
-    mkdir out/docs
-fi
 
 # Create and enter the `jcef_build` directory.
 # The `jcef_build` directory name is required by other JCEF tooling
diff --git a/macosx_codesign.sh b/macosx_codesign.sh
index c9b8c38..c56105e 100755
--- a/macosx_codesign.sh
+++ b/macosx_codesign.sh
@@ -54,4 +54,7 @@ bash macosx_codesign_zip.sh "$APP_DIR/$APP_NAME/Contents/Java/jogl-all-natives-m
 codesign --force --options runtime --entitlements "$ENTITLEMENTS_BROWSER" --sign "$2" --timestamp --verbose "$APP_DIR/$APP_NAME"
 bash macosx_notarize.sh "$APP_DIR/$APP_NAME" "$2" $3 org.jcef.jcef $4 $5 $6
 
+echo "Checking notarization validity"
+spctl -vvv --assess --type exec "$APP_DIR/$APP_NAME"
+
 echo "Done signing binaries"
diff --git a/macosx_notarize.sh b/macosx_notarize.sh
index e302157..984d59c 100755
--- a/macosx_notarize.sh
+++ b/macosx_notarize.sh
@@ -33,7 +33,18 @@ xcrun notarytool submit "$1.zip" \
                  --key $6 \
                  --key-id $5 \
                  --issuer $7 \
-                 --wait
+                 --wait 2>&1 | tee notary_output.txt
+
+requestUUID=$(cat notary_output.txt | awk '/id:/ { print $NF; exit; }')
+
+echo "Notarization log:"
+rm -f notarization.log
+xcrun notarytool log $requestUUID \
+                 --key $6 \
+                 --key-id $5 \
+                 --issuer $7 \
+                 notarization.log
+cat notarization.log
 
 # staple
 xcrun stapler staple "$1"