From 93e497b3ab756616de76a536378c1dbdf3b0f464 Mon Sep 17 00:00:00 2001 From: caoweiping Date: Sat, 18 Apr 2026 16:41:49 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix(scripts):=20=E4=BF=AE=E5=A4=8Dnotarize.?= =?UTF-8?q?sh=E4=B8=AD=E6=9D=A1=E4=BB=B6=E5=88=A4=E6=96=AD=E9=80=BB?= =?UTF-8?q?=E8=BE=91=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 修复notarization_method未正确设置的问题,将altool检查逻辑移至else块中 --- scripts/notarize.sh | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/scripts/notarize.sh b/scripts/notarize.sh index 8b02e747b..12b065d93 100755 --- a/scripts/notarize.sh +++ b/scripts/notarize.sh @@ -71,12 +71,13 @@ xcrun notarytool >/dev/null 2>&1 if [ $? -eq 0 ]; then echo "+ Found notarytool" notarization_method=run_notarytool -fi -# Fallbqck to altool -output=xcrun altool >/dev/null 2>&1 -if [ $? -eq 0 ]; then - echo "+ Found altool" - notarization_method=run_altool +else + # Fallback to altool + xcrun altool >/dev/null 2>&1 + if [ $? -eq 0 ]; then + echo "+ Found altool" + notarization_method=run_altool + fi fi if [ $notarization_method = "exit" ]; then From 55d0d14c95075de8238a5d632738cccacd61632b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Erik=20Bj=C3=A4reholt?= Date: Sat, 18 Apr 2026 12:02:37 +0200 Subject: [PATCH 2/2] Update scripts/notarize.sh Co-authored-by: greptile-apps[bot] <165735046+greptile-apps[bot]@users.noreply.github.com> --- scripts/notarize.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/notarize.sh b/scripts/notarize.sh index 12b065d93..68db220bc 100755 --- a/scripts/notarize.sh +++ b/scripts/notarize.sh @@ -73,7 +73,7 @@ if [ $? -eq 0 ]; then notarization_method=run_notarytool else # Fallback to altool - xcrun altool >/dev/null 2>&1 + xcrun -f altool >/dev/null 2>&1 if [ $? -eq 0 ]; then echo "+ Found altool" notarization_method=run_altool