From a596a1ddb67d37baa22f979f15fd75f48130f9b2 Mon Sep 17 00:00:00 2001
From: Alessandro Muntoni <muntoni.alessandro@gmail.com>
Date: Wed, 7 Jun 2023 15:03:09 +0200
Subject: [PATCH 01/13] not using archived actions anymore on CreateRelease
 workflow

---
 .github/workflows/CreateRelease.yml           | 22 +----------
 scripts/macOS/2_deploy.sh                     | 22 ++++++++++-
 .../macOS/internal/2c_notarize_appbundle.sh   | 39 +++++++++++++++++++
 .../macOS/internal/{2c_dmg.sh => 2d_dmg.sh}   |  0
 4 files changed, 61 insertions(+), 22 deletions(-)
 create mode 100644 scripts/macOS/internal/2c_notarize_appbundle.sh
 rename scripts/macOS/internal/{2c_dmg.sh => 2d_dmg.sh} (100%)

diff --git a/.github/workflows/CreateRelease.yml b/.github/workflows/CreateRelease.yml
index 63bc27f0d..8b63f8910 100644
--- a/.github/workflows/CreateRelease.yml
+++ b/.github/workflows/CreateRelease.yml
@@ -90,27 +90,7 @@ jobs:
     - name: Deploy
       shell: bash
       run: |
-        bash scripts/${{ runner.os }}/2_deploy.sh --cert_pssw='${{ secrets.WIN_CERTIFICATE_PSSW }}' --cert_id=${{ secrets.MACOS_CERT_ID }}
-    - name: Get AppBundle Name
-      if: runner.os == 'macOS'
-      id: abn
-      shell: bash
-      run: |
-        cd install
-        NAME=$(ls -d MeshLab*)
-        echo "app_bundle_name=$NAME" >> $GITHUB_OUTPUT
-    - name: Notarize macOS
-      if: runner.os == 'macOS'
-      uses: devbotsxyz/xcode-notarize@v1
-      with:
-        product-path: "install/${{steps.abn.outputs.app_bundle_name}}"
-        appstore-connect-username: ${{ secrets.MACOS_NOTARIZATION_USER }}
-        appstore-connect-password: ${{ secrets.MACOS_NOTARIZATION_PSSW }}
-    - name: Staple Release macOS
-      if: runner.os == 'macOS'
-      uses: devbotsxyz/xcode-staple@v1
-      with:
-        product-path: "install/${{steps.abn.outputs.app_bundle_name}}"
+        bash scripts/${{ runner.os }}/2_deploy.sh --cert_pssw='${{ secrets.WIN_CERTIFICATE_PSSW }}' --cert_id=${{ secrets.MACOS_CERT_ID }} --notarization_user=${{ secrets.MACOS_NOTARIZATION_USER }} --notarization_pssw='${{ secrets.MACOS_NOTARIZATION_PSSW }}'
     - name: Upload MeshLab Portable
       uses: actions/upload-artifact@v3
       with:
diff --git a/scripts/macOS/2_deploy.sh b/scripts/macOS/2_deploy.sh
index b3a3a791a..16007fef3 100755
--- a/scripts/macOS/2_deploy.sh
+++ b/scripts/macOS/2_deploy.sh
@@ -6,7 +6,10 @@ INSTALL_PATH=$SCRIPTS_PATH/../../install
 QT_DIR_OPTION=""
 PACKAGES_PATH=$SCRIPTS_PATH/../../packages
 SIGN=false
+NOTARIZE=false
 CERT_ID=""
+NOT_USER=""
+NOT_PASSWORD=""
 
 #checking for parameters
 for i in "$@"
@@ -31,6 +34,17 @@ case $i in
         fi
         shift # past argument=value
         ;;
+    -nu=*|--notarization_user=*)
+        if [ -z "${i#*=}" ]; then
+            NOTARIZE=true
+            NOT_USER="${i#*=}"
+        fi
+        shift # past argument=value
+        ;;
+    -np=*|--notarization_password=*)
+        NOT_PASSWORD="${i#*=}"
+        shift # past argument=value
+        ;;
     *)
         # unknown option
         ;;
@@ -47,6 +61,12 @@ if [ "$SIGN" = true ] ; then
     echo "======= AppBundle Signed ======="
 fi
 
-bash $SCRIPTS_PATH/internal/2c_dmg.sh -i=$INSTALL_PATH -p=$PACKAGES_PATH
+if [ "$NOTARIZE" = true ] ; then
+    bash $SCRIPTS_PATH/internal/2c_notarize_appbundle.sh -i=$INSTALL_PATH -nu=$NOT_USER -np=$NOT_PASSWORD
+
+    echo "======= AppBundle Notarized ======="
+fi
+
+bash $SCRIPTS_PATH/internal/2d_dmg.sh -i=$INSTALL_PATH -p=$PACKAGES_PATH
 
 echo "======= DMG Created ======="
\ No newline at end of file
diff --git a/scripts/macOS/internal/2c_notarize_appbundle.sh b/scripts/macOS/internal/2c_notarize_appbundle.sh
new file mode 100644
index 000000000..902122bab
--- /dev/null
+++ b/scripts/macOS/internal/2c_notarize_appbundle.sh
@@ -0,0 +1,39 @@
+#!/bin/bash
+
+SCRIPTS_PATH="$(dirname "$(realpath "$0")")"/..
+
+INSTALL_PATH=$SCRIPTS_PATH/../../install
+NOT_USER=""
+NOT_PASSWORD=""
+
+#checking for parameters
+for i in "$@"
+do
+case $i in
+    -i=*|--install_path=*)
+        INSTALL_PATH="${i#*=}"
+        shift # past argument=value
+        ;;
+    -nu=*|--notarization_user=*)
+        NOT_USER="${i#*=}"
+        shift # past argument=value
+        ;;
+    -np=*|--notarization_password=*)
+        NOT_PASSWORD="${i#*=}"
+        shift # past argument=value
+        ;;
+    *)
+        # unknown option
+        ;;
+esac
+done
+
+xcrun notarytool store-credentials "notarytool-profile" --apple-id "$NOT_USER" --password "$NOT_PASSWORD"
+
+ditto -c -k --keepParent "$INSTALL_PATH/meshlab.app" "$INSTALL_PATH/notarization.zip"
+
+xcrun notarytool submit "install/notarization.zip" --keychain-profile "notarytool-profile" --wait
+
+xcrun stapler staple "$INSTALL_PATH/meshlab.app"
+
+rm -rf $INSTALL_PATH/notarization.zip
\ No newline at end of file
diff --git a/scripts/macOS/internal/2c_dmg.sh b/scripts/macOS/internal/2d_dmg.sh
similarity index 100%
rename from scripts/macOS/internal/2c_dmg.sh
rename to scripts/macOS/internal/2d_dmg.sh

From d87e091195e07e160473ac7948f71e52962a4edd Mon Sep 17 00:00:00 2001
From: Alessandro Muntoni <muntoni.alessandro@gmail.com>
Date: Wed, 7 Jun 2023 15:40:38 +0200
Subject: [PATCH 02/13] fix macos deploy script

---
 scripts/macOS/2_deploy.sh | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/scripts/macOS/2_deploy.sh b/scripts/macOS/2_deploy.sh
index 16007fef3..0ad081a2a 100755
--- a/scripts/macOS/2_deploy.sh
+++ b/scripts/macOS/2_deploy.sh
@@ -28,17 +28,13 @@ case $i in
         shift # past argument=value
         ;;
     -ci=*|--cert_id=*)
-        if [ -z "${i#*=}" ]; then
-            SIGN=true
-            CERT_ID="${i#*=}"
-        fi
+        SIGN=true
+        CERT_ID="${i#*=}"
         shift # past argument=value
         ;;
     -nu=*|--notarization_user=*)
-        if [ -z "${i#*=}" ]; then
-            NOTARIZE=true
-            NOT_USER="${i#*=}"
-        fi
+        NOTARIZE=true
+        NOT_USER="${i#*=}"
         shift # past argument=value
         ;;
     -np=*|--notarization_password=*)

From 8ff46533341c24a6a0859b15a3e7c11419767ad5 Mon Sep 17 00:00:00 2001
From: Alessandro Muntoni <muntoni.alessandro@gmail.com>
Date: Wed, 7 Jun 2023 15:57:48 +0200
Subject: [PATCH 03/13] sign and notarize only when options available

---
 scripts/macOS/2_deploy.sh                       | 16 ++++++++++------
 scripts/macOS/internal/2c_notarize_appbundle.sh | 10 +++++-----
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/scripts/macOS/2_deploy.sh b/scripts/macOS/2_deploy.sh
index 0ad081a2a..1426d0258 100755
--- a/scripts/macOS/2_deploy.sh
+++ b/scripts/macOS/2_deploy.sh
@@ -8,8 +8,8 @@ PACKAGES_PATH=$SCRIPTS_PATH/../../packages
 SIGN=false
 NOTARIZE=false
 CERT_ID=""
-NOT_USER=""
-NOT_PASSWORD=""
+NOTAR_USER=""
+NOTAR_PASSWORD=""
 
 #checking for parameters
 for i in "$@"
@@ -28,17 +28,21 @@ case $i in
         shift # past argument=value
         ;;
     -ci=*|--cert_id=*)
-        SIGN=true
         CERT_ID="${i#*=}"
+        if [ -n "$CERT_ID" ]; then
+          SIGN=true
+        fi
         shift # past argument=value
         ;;
     -nu=*|--notarization_user=*)
-        NOTARIZE=true
         NOT_USER="${i#*=}"
+        if [ -n "$NOT_USER" ]; then
+          NOTARIZE=true
+        fi
         shift # past argument=value
         ;;
     -np=*|--notarization_password=*)
-        NOT_PASSWORD="${i#*=}"
+        NOTAR_PASSWORD="${i#*=}"
         shift # past argument=value
         ;;
     *)
@@ -58,7 +62,7 @@ if [ "$SIGN" = true ] ; then
 fi
 
 if [ "$NOTARIZE" = true ] ; then
-    bash $SCRIPTS_PATH/internal/2c_notarize_appbundle.sh -i=$INSTALL_PATH -nu=$NOT_USER -np=$NOT_PASSWORD
+    bash $SCRIPTS_PATH/internal/2c_notarize_appbundle.sh -i=$INSTALL_PATH -nu=$NOT_USER -np=$NOTAR_PASSWORD
 
     echo "======= AppBundle Notarized ======="
 fi
diff --git a/scripts/macOS/internal/2c_notarize_appbundle.sh b/scripts/macOS/internal/2c_notarize_appbundle.sh
index 902122bab..9b2188eb4 100644
--- a/scripts/macOS/internal/2c_notarize_appbundle.sh
+++ b/scripts/macOS/internal/2c_notarize_appbundle.sh
@@ -3,8 +3,8 @@
 SCRIPTS_PATH="$(dirname "$(realpath "$0")")"/..
 
 INSTALL_PATH=$SCRIPTS_PATH/../../install
-NOT_USER=""
-NOT_PASSWORD=""
+NOTAR_USER=""
+NOTAR_PASSWORD=""
 
 #checking for parameters
 for i in "$@"
@@ -15,11 +15,11 @@ case $i in
         shift # past argument=value
         ;;
     -nu=*|--notarization_user=*)
-        NOT_USER="${i#*=}"
+        NOTAR_USER="${i#*=}"
         shift # past argument=value
         ;;
     -np=*|--notarization_password=*)
-        NOT_PASSWORD="${i#*=}"
+        NOTAR_PASSWORD="${i#*=}"
         shift # past argument=value
         ;;
     *)
@@ -28,7 +28,7 @@ case $i in
 esac
 done
 
-xcrun notarytool store-credentials "notarytool-profile" --apple-id "$NOT_USER" --password "$NOT_PASSWORD"
+xcrun notarytool store-credentials "notarytool-profile" --apple-id "$NOTAR_USER" --password "$NOTAR_PASSWORD"
 
 ditto -c -k --keepParent "$INSTALL_PATH/meshlab.app" "$INSTALL_PATH/notarization.zip"
 

From 7872cc26ab7ab6fd7bf02af4fb459b5acdb18a21 Mon Sep 17 00:00:00 2001
From: alemuntoni <muntoni.alessandro@gmail.com>
Date: Wed, 7 Jun 2023 16:36:54 +0200
Subject: [PATCH 04/13] fix macos deploy script

---
 scripts/macOS/2_deploy.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/macOS/2_deploy.sh b/scripts/macOS/2_deploy.sh
index 1426d0258..6a938ee9d 100755
--- a/scripts/macOS/2_deploy.sh
+++ b/scripts/macOS/2_deploy.sh
@@ -62,7 +62,7 @@ if [ "$SIGN" = true ] ; then
 fi
 
 if [ "$NOTARIZE" = true ] ; then
-    bash $SCRIPTS_PATH/internal/2c_notarize_appbundle.sh -i=$INSTALL_PATH -nu=$NOT_USER -np=$NOTAR_PASSWORD
+    bash $SCRIPTS_PATH/internal/2c_notarize_appbundle.sh -i=$INSTALL_PATH -nu=$NOTAR_USER -np=$NOTAR_PASSWORD
 
     echo "======= AppBundle Notarized ======="
 fi

From ebfb70655fedea4dec78adb12f6817c9a9c87d1f Mon Sep 17 00:00:00 2001
From: Alessandro Muntoni <muntoni.alessandro@gmail.com>
Date: Thu, 8 Jun 2023 09:31:31 +0200
Subject: [PATCH 05/13] fix macos notarization script

---
 scripts/macOS/internal/2c_notarize_appbundle.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/macOS/internal/2c_notarize_appbundle.sh b/scripts/macOS/internal/2c_notarize_appbundle.sh
index 9b2188eb4..b394892bb 100644
--- a/scripts/macOS/internal/2c_notarize_appbundle.sh
+++ b/scripts/macOS/internal/2c_notarize_appbundle.sh
@@ -28,7 +28,7 @@ case $i in
 esac
 done
 
-xcrun notarytool store-credentials "notarytool-profile" --apple-id "$NOTAR_USER" --password "$NOTAR_PASSWORD"
+xcrun notarytool store-credentials "notarytool-profile" --apple-id $NOTAR_USER --password $NOTAR_PASSWORD
 
 ditto -c -k --keepParent "$INSTALL_PATH/meshlab.app" "$INSTALL_PATH/notarization.zip"
 

From 511e6902631d9c6355ffa5d4af732978b7e8d5fe Mon Sep 17 00:00:00 2001
From: Alessandro Muntoni <muntoni.alessandro@gmail.com>
Date: Thu, 8 Jun 2023 09:45:40 +0200
Subject: [PATCH 06/13] fix macos deploy script

---
 scripts/macOS/2_deploy.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/macOS/2_deploy.sh b/scripts/macOS/2_deploy.sh
index 6a938ee9d..e1e4c0572 100755
--- a/scripts/macOS/2_deploy.sh
+++ b/scripts/macOS/2_deploy.sh
@@ -35,8 +35,8 @@ case $i in
         shift # past argument=value
         ;;
     -nu=*|--notarization_user=*)
-        NOT_USER="${i#*=}"
-        if [ -n "$NOT_USER" ]; then
+        NOTAR_USER="${i#*=}"
+        if [ -n "$NOTAR_USER" ]; then
           NOTARIZE=true
         fi
         shift # past argument=value

From ebaf1a2249d8aafd94f89ba48b19f73f549d2476 Mon Sep 17 00:00:00 2001
From: Alessandro Muntoni <muntoni.alessandro@gmail.com>
Date: Thu, 8 Jun 2023 09:55:43 +0200
Subject: [PATCH 07/13] fix CreateRelease workflow

---
 .github/workflows/CreateRelease.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/CreateRelease.yml b/.github/workflows/CreateRelease.yml
index 8b63f8910..b32b799db 100644
--- a/.github/workflows/CreateRelease.yml
+++ b/.github/workflows/CreateRelease.yml
@@ -90,7 +90,7 @@ jobs:
     - name: Deploy
       shell: bash
       run: |
-        bash scripts/${{ runner.os }}/2_deploy.sh --cert_pssw='${{ secrets.WIN_CERTIFICATE_PSSW }}' --cert_id=${{ secrets.MACOS_CERT_ID }} --notarization_user=${{ secrets.MACOS_NOTARIZATION_USER }} --notarization_pssw='${{ secrets.MACOS_NOTARIZATION_PSSW }}'
+        bash scripts/${{ runner.os }}/2_deploy.sh --cert_pssw='${{ secrets.WIN_CERTIFICATE_PSSW }}' --cert_id=${{ secrets.MACOS_CERT_ID }} --notarization_user=${{ secrets.MACOS_NOTARIZATION_USER }} --notarization_pssw=${{ secrets.MACOS_NOTARIZATION_PSSW }}
     - name: Upload MeshLab Portable
       uses: actions/upload-artifact@v3
       with:

From bcd070823f4a3cbf75da1c8ecbe6f12d9358ba43 Mon Sep 17 00:00:00 2001
From: Alessandro Muntoni <muntoni.alessandro@gmail.com>
Date: Thu, 8 Jun 2023 10:08:34 +0200
Subject: [PATCH 08/13] fix macos notarization scripts

---
 scripts/macOS/2_deploy.sh                       | 2 +-
 scripts/macOS/internal/2c_notarize_appbundle.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/macOS/2_deploy.sh b/scripts/macOS/2_deploy.sh
index e1e4c0572..7f5f32a6d 100755
--- a/scripts/macOS/2_deploy.sh
+++ b/scripts/macOS/2_deploy.sh
@@ -41,7 +41,7 @@ case $i in
         fi
         shift # past argument=value
         ;;
-    -np=*|--notarization_password=*)
+    -np=*|--notarization_pssw=*)
         NOTAR_PASSWORD="${i#*=}"
         shift # past argument=value
         ;;
diff --git a/scripts/macOS/internal/2c_notarize_appbundle.sh b/scripts/macOS/internal/2c_notarize_appbundle.sh
index b394892bb..2a1be5b88 100644
--- a/scripts/macOS/internal/2c_notarize_appbundle.sh
+++ b/scripts/macOS/internal/2c_notarize_appbundle.sh
@@ -18,7 +18,7 @@ case $i in
         NOTAR_USER="${i#*=}"
         shift # past argument=value
         ;;
-    -np=*|--notarization_password=*)
+    -np=*|--notarization_pssw=*)
         NOTAR_PASSWORD="${i#*=}"
         shift # past argument=value
         ;;

From 424fcbbda4e4f0b9b7312da963d4cc3c8cd21ed3 Mon Sep 17 00:00:00 2001
From: Alessandro Muntoni <muntoni.alessandro@gmail.com>
Date: Thu, 8 Jun 2023 10:21:10 +0200
Subject: [PATCH 09/13] fix macos notarization scripts

---
 scripts/macOS/internal/2c_notarize_appbundle.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/macOS/internal/2c_notarize_appbundle.sh b/scripts/macOS/internal/2c_notarize_appbundle.sh
index 2a1be5b88..29025b79c 100644
--- a/scripts/macOS/internal/2c_notarize_appbundle.sh
+++ b/scripts/macOS/internal/2c_notarize_appbundle.sh
@@ -28,7 +28,7 @@ case $i in
 esac
 done
 
-xcrun notarytool store-credentials "notarytool-profile" --apple-id $NOTAR_USER --password $NOTAR_PASSWORD
+xcrun notarytool store-credentials "notarytool-profile" --apple-id "$NOTAR_USER" --password "$NOTAR_PASSWORD"
 
 ditto -c -k --keepParent "$INSTALL_PATH/meshlab.app" "$INSTALL_PATH/notarization.zip"
 

From e46cf95350c5aec9e4a1d51d31ca0b33108c2434 Mon Sep 17 00:00:00 2001
From: Alessandro Muntoni <muntoni.alessandro@gmail.com>
Date: Thu, 8 Jun 2023 10:49:07 +0200
Subject: [PATCH 10/13] fix CreateRelease workflow

---
 .github/workflows/CreateRelease.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/CreateRelease.yml b/.github/workflows/CreateRelease.yml
index b32b799db..eed8a321d 100644
--- a/.github/workflows/CreateRelease.yml
+++ b/.github/workflows/CreateRelease.yml
@@ -90,7 +90,7 @@ jobs:
     - name: Deploy
       shell: bash
       run: |
-        bash scripts/${{ runner.os }}/2_deploy.sh --cert_pssw='${{ secrets.WIN_CERTIFICATE_PSSW }}' --cert_id=${{ secrets.MACOS_CERT_ID }} --notarization_user=${{ secrets.MACOS_NOTARIZATION_USER }} --notarization_pssw=${{ secrets.MACOS_NOTARIZATION_PSSW }}
+        bash scripts/${{ runner.os }}/2_deploy.sh --cert_pssw='${{ secrets.WIN_CERTIFICATE_PSSW }}' --cert_id='${{ secrets.MACOS_CERT_ID }}' --notarization_user='${{ secrets.MACOS_NOTARIZATION_USER }}' --notarization_pssw='${{ secrets.MACOS_NOTARIZATION_PSSW }}'
     - name: Upload MeshLab Portable
       uses: actions/upload-artifact@v3
       with:

From 5bd08a343ca9b4d9088972146a00bcbaa3747e82 Mon Sep 17 00:00:00 2001
From: Alessandro Muntoni <muntoni.alessandro@gmail.com>
Date: Thu, 8 Jun 2023 11:22:58 +0200
Subject: [PATCH 11/13] add notarization team

---
 .github/workflows/CreateRelease.yml             | 2 +-
 scripts/macOS/2_deploy.sh                       | 7 ++++++-
 scripts/macOS/internal/2c_notarize_appbundle.sh | 7 ++++++-
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/CreateRelease.yml b/.github/workflows/CreateRelease.yml
index eed8a321d..ec0770101 100644
--- a/.github/workflows/CreateRelease.yml
+++ b/.github/workflows/CreateRelease.yml
@@ -90,7 +90,7 @@ jobs:
     - name: Deploy
       shell: bash
       run: |
-        bash scripts/${{ runner.os }}/2_deploy.sh --cert_pssw='${{ secrets.WIN_CERTIFICATE_PSSW }}' --cert_id='${{ secrets.MACOS_CERT_ID }}' --notarization_user='${{ secrets.MACOS_NOTARIZATION_USER }}' --notarization_pssw='${{ secrets.MACOS_NOTARIZATION_PSSW }}'
+        bash scripts/${{ runner.os }}/2_deploy.sh --cert_pssw='${{ secrets.WIN_CERTIFICATE_PSSW }}' --cert_id='${{ secrets.MACOS_CERT_ID }}' --notarization_user='${{ secrets.MACOS_NOTARIZATION_USER }}' --notarization_team='${{ secrets.MACOS_NOTARIZATION_TEAM_ID }}' --notarization_pssw='${{ secrets.MACOS_NOTARIZATION_PSSW }}'
     - name: Upload MeshLab Portable
       uses: actions/upload-artifact@v3
       with:
diff --git a/scripts/macOS/2_deploy.sh b/scripts/macOS/2_deploy.sh
index 7f5f32a6d..f359e86e6 100755
--- a/scripts/macOS/2_deploy.sh
+++ b/scripts/macOS/2_deploy.sh
@@ -9,6 +9,7 @@ SIGN=false
 NOTARIZE=false
 CERT_ID=""
 NOTAR_USER=""
+NOTAR_TEAM_ID=""
 NOTAR_PASSWORD=""
 
 #checking for parameters
@@ -45,6 +46,10 @@ case $i in
         NOTAR_PASSWORD="${i#*=}"
         shift # past argument=value
         ;;
+    -nt=*|--notarization_team=*)
+        NOTAR_TEAM_ID="${i#*=}"
+        shift # past argument=value
+        ;;
     *)
         # unknown option
         ;;
@@ -62,7 +67,7 @@ if [ "$SIGN" = true ] ; then
 fi
 
 if [ "$NOTARIZE" = true ] ; then
-    bash $SCRIPTS_PATH/internal/2c_notarize_appbundle.sh -i=$INSTALL_PATH -nu=$NOTAR_USER -np=$NOTAR_PASSWORD
+    bash $SCRIPTS_PATH/internal/2c_notarize_appbundle.sh -i=$INSTALL_PATH -nu=$NOTAR_USER -nt=$NOTAR_TEAM_ID -np=$NOTAR_PASSWORD
 
     echo "======= AppBundle Notarized ======="
 fi
diff --git a/scripts/macOS/internal/2c_notarize_appbundle.sh b/scripts/macOS/internal/2c_notarize_appbundle.sh
index 29025b79c..3eb6346ca 100644
--- a/scripts/macOS/internal/2c_notarize_appbundle.sh
+++ b/scripts/macOS/internal/2c_notarize_appbundle.sh
@@ -5,6 +5,7 @@ SCRIPTS_PATH="$(dirname "$(realpath "$0")")"/..
 INSTALL_PATH=$SCRIPTS_PATH/../../install
 NOTAR_USER=""
 NOTAR_PASSWORD=""
+NOTAR_TEAM_ID=""
 
 #checking for parameters
 for i in "$@"
@@ -18,6 +19,10 @@ case $i in
         NOTAR_USER="${i#*=}"
         shift # past argument=value
         ;;
+    -nt=*|--notarization_team=*)
+        NOTAR_TEAM_ID="${i#*=}"
+        shift # past argument=value
+        ;;
     -np=*|--notarization_pssw=*)
         NOTAR_PASSWORD="${i#*=}"
         shift # past argument=value
@@ -28,7 +33,7 @@ case $i in
 esac
 done
 
-xcrun notarytool store-credentials "notarytool-profile" --apple-id "$NOTAR_USER" --password "$NOTAR_PASSWORD"
+xcrun notarytool store-credentials "notarytool-profile" --apple-id $NOTAR_USER --team-id $NOTAR_TEAM_ID --password $NOTAR_PASSWORD
 
 ditto -c -k --keepParent "$INSTALL_PATH/meshlab.app" "$INSTALL_PATH/notarization.zip"
 

From 75a9b8cdd9ff9cf14e431c5d7c26407c18e3caad Mon Sep 17 00:00:00 2001
From: Alessandro Muntoni <muntoni.alessandro@gmail.com>
Date: Thu, 8 Jun 2023 12:14:53 +0200
Subject: [PATCH 12/13] fix sign

---
 scripts/macOS/internal/2b_sign_appbundle.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/scripts/macOS/internal/2b_sign_appbundle.sh b/scripts/macOS/internal/2b_sign_appbundle.sh
index 9837efb8a..268d6c456 100644
--- a/scripts/macOS/internal/2b_sign_appbundle.sh
+++ b/scripts/macOS/internal/2b_sign_appbundle.sh
@@ -23,4 +23,6 @@ case $i in
 esac
 done
 
-codesign --options "runtime" --timestamp --force --deep --sign $CERT_ID $INSTALL_PATH/meshlab.app
\ No newline at end of file
+codesign --options "runtime" --timestamp --force --deep --sign $CERT_ID $INSTALL_PATH/meshlab.app
+
+spctl -a -vvv $INSTALL_PATH/meshlab.app
\ No newline at end of file

From 481a66dbb6ac816318d5c253e372439cd18ef9b8 Mon Sep 17 00:00:00 2001
From: Alessandro Muntoni <muntoni.alessandro@gmail.com>
Date: Thu, 8 Jun 2023 12:36:29 +0200
Subject: [PATCH 13/13] using fixed update release action

---
 .github/workflows/CreateRelease.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/CreateRelease.yml b/.github/workflows/CreateRelease.yml
index ec0770101..d4b541f3d 100644
--- a/.github/workflows/CreateRelease.yml
+++ b/.github/workflows/CreateRelease.yml
@@ -222,7 +222,7 @@ jobs:
         cd ..
 
     #Create release and upload
-    - uses: "marvinpinto/action-automatic-releases@latest"
+    - uses: "marvinpinto/action-automatic-releases@6273874b61ebc8c71f1a61b2d98e234cf389b303"
       with:
         repo_token: "${{ secrets.GITHUB_TOKEN }}"
         automatic_release_tag: "MeshLab-${{steps.envs.outputs.ml_version}}"