From 82ce4aa571dfa74032d4697984cc932257cfa35b Mon Sep 17 00:00:00 2001
From: Ariver <shanghai3168@gmail.com>
Date: Fri, 05 Jun 2026 04:07:28 +0800
Subject: [PATCH] Prepare clean App Store rebuild
---
privatevoice.src/scripts/build-macappstore-pkg-macos.sh | 39 ++++++++++++++++++++++++++++++++++++---
1 files changed, 36 insertions(+), 3 deletions(-)
diff --git a/privatevoice.src/scripts/build-macappstore-pkg-macos.sh b/privatevoice.src/scripts/build-macappstore-pkg-macos.sh
index cfa9cd5..1b3b0d7 100755
--- a/privatevoice.src/scripts/build-macappstore-pkg-macos.sh
+++ b/privatevoice.src/scripts/build-macappstore-pkg-macos.sh
@@ -20,6 +20,7 @@
# Optional environment:
# PRIVATEVOICE_SIGNING_KEYCHAIN
# PRIVATEVOICE_APPSTORE_MIN_SYSTEM_VERSION (default: 13.4)
+# PRIVATEVOICE_MACAPPSTORE_BUILD_ROOT (default: build/macappstore)
#
# Usage:
# cd privatevoice.src
@@ -39,6 +40,7 @@
SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
PROJECT_DIR="$(cd "$SCRIPT_DIR/.." && pwd)"
+MACAPPSTORE_BUILD_ROOT="${PRIVATEVOICE_MACAPPSTORE_BUILD_ROOT:-$PROJECT_DIR/build/macappstore}"
INFO_PLIST="$PROJECT_DIR/build/darwin/Info.plist"
BASE_ENTITLEMENTS="$PROJECT_DIR/build/darwin/entitlements-appstore.plist"
@@ -94,7 +96,7 @@
;;
esac
- BUILD_DIR="$PROJECT_DIR/build/macappstore/$OUT_ARCH"
+ BUILD_DIR="$MACAPPSTORE_BUILD_ROOT/$OUT_ARCH"
APP_BUNDLE="$BUILD_DIR/$APP_NAME.app"
PKG_PATH="$BUILD_DIR/PrivateVoice-Dictation-$VERSION-build$BUILD_ID-$OUT_ARCH-macappstore.pkg"
SHERPA_LIB_DIR="$GOMODCACHE/github.com/k2-fsa/sherpa-onnx-go-macos@$SHERPA_MACOS_MODULE_VERSION/lib/$SHERPA_ARCH"
@@ -132,7 +134,8 @@
strip_extended_attributes() {
local item="$1"
if command -v xattr >/dev/null; then
- xattr -cr "$item" 2>/dev/null || true
+ chmod -R u+rwX "$item"
+ xattr -cr "$item"
fi
}
@@ -144,6 +147,31 @@
[[ -z "$found" ]] || fail "com.apple.quarantine attributes remain under $item:
$found"
fi
+}
+
+remove_appledouble_files() {
+ local item="$1"
+ find "$item" \( -name '._*' -o -name '.DS_Store' \) -delete
+}
+
+assert_no_appledouble_files() {
+ local item="$1"
+ local found
+ found="$(find "$item" \( -name '._*' -o -name '.DS_Store' \) -print | head -n 20 || true)"
+ [[ -z "$found" ]] || fail "AppleDouble or Finder metadata files remain under $item:
+$found"
+}
+
+assert_pkg_no_quarantine_attributes() {
+ local pkg="$1"
+ local expanded
+ local found
+ expanded="$(mktemp -d)"
+ pkgutil --expand-full "$pkg" "$expanded/pkg" >/dev/null
+ found="$(xattr -lr "$expanded/pkg" 2>/dev/null | grep -F "com.apple.quarantine" | head -n 20 || true)"
+ rm -rf "$expanded"
+ [[ -z "$found" ]] || fail "com.apple.quarantine attributes remain in package:
+$found"
}
TARGET_ARCH="${1:-$(uname -m)}"
@@ -229,7 +257,9 @@
step "Removing extended attributes from app bundle"
strip_extended_attributes "$APP_BUNDLE"
+remove_appledouble_files "$APP_BUNDLE"
assert_no_quarantine_attributes "$APP_BUNDLE"
+assert_no_appledouble_files "$APP_BUNDLE"
step "Fixing rpaths"
install_name_tool -add_rpath @executable_path/../Frameworks \
@@ -247,7 +277,9 @@
step "Removing extended attributes after signing"
strip_extended_attributes "$APP_BUNDLE"
+remove_appledouble_files "$APP_BUNDLE"
assert_no_quarantine_attributes "$APP_BUNDLE"
+assert_no_appledouble_files "$APP_BUNDLE"
step "Verifying app signature and entitlements"
codesign -vvv --deep --strict "$APP_BUNDLE"
@@ -260,13 +292,14 @@
fail "Signed app application-identifier mismatch: signed has $SIGNED_APP_IDENTIFIER, profile has $PROFILE_APP_IDENTIFIER"
step "Creating signed installer package"
-productbuild \
+COPYFILE_DISABLE=1 productbuild \
--sign "$APPSTORE_INSTALLER_IDENTITY" \
--component "$APP_BUNDLE" /Applications \
"$PKG_PATH"
step "Verifying installer package signature"
pkgutil --check-signature "$PKG_PATH"
+assert_pkg_no_quarantine_attributes "$PKG_PATH"
step "Mac App Store package complete"
echo " App: $APP_BUNDLE"
--
Gitblit v1.9.3