From 358aeffae644a5e7f938a148b2ea9e879d0baedb Mon Sep 17 00:00:00 2001 From: alves Date: Thu, 5 Mar 2026 11:01:15 +0800 Subject: [PATCH 1/3] fix code format question --- scripts/sign_and_package.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/scripts/sign_and_package.sh b/scripts/sign_and_package.sh index 0344dda937..1f241478ba 100644 --- a/scripts/sign_and_package.sh +++ b/scripts/sign_and_package.sh @@ -336,7 +336,7 @@ fi MOUNTED_DMG=$(hdiutil info | grep "/Volumes/$DMG_VOLNAME" || true) if [ -n "$MOUNTED_DMG" ]; then echo "警告: 发现已挂载的同名卷,尝试卸载..." - hdiutil info | grep "/Volumes/$DMG_VOLNAME" | grep -o '/dev/disk[0-9]*' | while read disk; do + hdiutil info | grep "/Volumes/$DMG_VOLNAME" | grep -o '/dev/disk[0-9]*' | while read -r disk; do hdiutil detach "$disk" -force 2>/dev/null || true done sleep 2 @@ -416,8 +416,6 @@ if [ -z "$NOTARY_PASSWORD" ] || [ "$NOTARY_PASSWORD" = "__PLEASE_ENTER_PASSWORD_ echo "跳过公证步骤..." else echo "✓ 密码已配置" - CAN_NOTARY=true - echo "" echo "==========================================" echo "步骤 5/6: 提交公证" From 48278600d1696eb1e5bf9a9bfcf24df5baa604ef Mon Sep 17 00:00:00 2001 From: alves Date: Thu, 5 Mar 2026 11:05:30 +0800 Subject: [PATCH 2/3] fix remove not work code. --- scripts/sign_and_package.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/sign_and_package.sh b/scripts/sign_and_package.sh index 1f241478ba..f3b036b64a 100644 --- a/scripts/sign_and_package.sh +++ b/scripts/sign_and_package.sh @@ -39,7 +39,7 @@ ENTITLEMENTS="$PROJECT_DIR/scripts/disable_validation.entitlements" # ============================================ NOTARY_APPLE_ID="snapmaker-app@snapmaker.com" NOTARY_TEAM_ID="5NGD3B3V37" -NOTARY_KEYCHAIN_PROFILE="snapmaker" +#NOTARY_KEYCHAIN_PROFILE="snapmaker" NOTARY_PASSWORD="guhi-nuxy-mgnh-cbqs" echo "==========================================" From b0fe0859f7c5145a70ca3408e044fe4295489724 Mon Sep 17 00:00:00 2001 From: alves Date: Thu, 5 Mar 2026 16:24:14 +0800 Subject: [PATCH 3/3] fix linux build failed with the wxwidget dark theme patch --- scripts/flatpak/io.github.Snapmaker.Snapmaker_Orca.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/scripts/flatpak/io.github.Snapmaker.Snapmaker_Orca.yml b/scripts/flatpak/io.github.Snapmaker.Snapmaker_Orca.yml index 28a2bda246..d024787914 100644 --- a/scripts/flatpak/io.github.Snapmaker.Snapmaker_Orca.yml +++ b/scripts/flatpak/io.github.Snapmaker.Snapmaker_Orca.yml @@ -104,12 +104,6 @@ modules: url: https://github.com/SoftFever/Orca-deps-wxWidgets branch: master path: ../ - - type: file - path: patches/0001-Enable-using-a-dark-theme-when-Gnome-dark-style-is-s.patch - dest-filename: wxwidgets-dark-theme.patch - - type: shell - commands: - - patch -p1 < wxwidgets-dark-theme.patch cleanup: - "*.la" - "*.a"