TRIPandbaiqing
f38643f17c
* feat: integrate Sparkle 2 for auto-update Adds the standard pieces for Sparkle-based silent updates: - Package.swift: add Sparkle 2 SPM dep, wired into OpenLessApp. - Sources/OpenLessApp/Updater/UpdaterController.swift: thin wrapper around SPUStandardUpdaterController. Owned by AppDelegate so the updater starts on app launch. - AppDelegate: instantiate UpdaterController before installing the main menu; pass it to ApplicationMenu so the menu item can target it. - ApplicationMenu: add "检查更新…" as the first item in the OpenLess menu when an UpdaterController target is present. - scripts/build-app.sh: copy Sparkle.framework (with Updater.app + XPC services + Autoupdate) from the SPM artifacts dir into Contents/Frameworks/, inject SUFeedURL / SUPublicEDKey / SUEnableAutomaticChecks / SUEnableInstallerLauncherService / SUScheduledCheckInterval into Info.plist, and ad-hoc sign the embedded helpers explicitly (deep sign alone is unreliable for Sparkle's nested XPC bundles). - scripts/release.sh: one-shot release pipeline. ./scripts/release.sh <version> [<build>] [<notes>] Bumps version in build-app.sh, builds, zips, signs the zip with the Keychain-stored EdDSA private key (auto-downloads sign_update from the Sparkle 2.9.1 release on first run), prepends a new <item> to appcast.xml, commits + tags + pushes main, and creates the GitHub release with the zip uploaded. - appcast.xml: empty initial feed file at repo root, served via the raw.githubusercontent.com URL referenced by SUFeedURL. Items are appended automatically by release.sh. Public EdDSA key embedded in the build: iT00+eUw/55obn1suEnWqI7za2pc8mHIFIdRbOWXW1Q= Private key lives only in the local Keychain on the release machine (account: macOS login user; service: https://sparkle-project.org). First-time install still requires the user to remove the quarantine xattr (no Apple Developer ID); subsequent updates flow through Sparkle's installer helper and bypass quarantine. * fix(sparkle): add @executable_path/../Frameworks rpath to OpenLessApp Without this, the SPM-built executable links Sparkle's symbols but ships with no rpath that points at the embedded framework, so dyld fails at launch with: Library not loaded: @rpath/Sparkle.framework/Versions/B/Sparkle …and the user sees the macOS Gatekeeper-styled "请与开发者联系，以确保 OpenLess 可以配合此 macOS 版本使用" error. Inject the rpath via linkerSettings.unsafeFlags so the binary itself knows where to look. --------- Co-authored-by: baiqing <lbx12309@icloud.com>
127 lines
5.4 KiB
Bash
Executable File
127 lines
5.4 KiB
Bash
Executable File
#!/usr/bin/env bash
|
||
# 把 OpenLess 打包成 .app bundle + ad-hoc codesign
|
||
set -euo pipefail
|
||
|
||
cd "$(dirname "$0")/.."
|
||
|
||
APP_NAME="OpenLess"
|
||
BUNDLE_ID="com.openless.app"
|
||
APP_VERSION="1.0.01"
|
||
BUILD_NUMBER="A1003"
|
||
BUILD_DIR="build"
|
||
APP_DIR="${BUILD_DIR}/${APP_NAME}.app"
|
||
BIN_DIR="${APP_DIR}/Contents/MacOS"
|
||
RES_DIR="${APP_DIR}/Contents/Resources"
|
||
FRAMEWORKS_DIR="${APP_DIR}/Contents/Frameworks"
|
||
|
||
# Sparkle 自动更新：appcast 文件的公开 URL + 锁定签名所用的 EdDSA 公钥。
|
||
# 公钥永远公开（验证下载内容用），私钥只在本机 Keychain，不进仓库。
|
||
SPARKLE_FEED_URL="https://raw.githubusercontent.com/appergb/openless/main/appcast.xml"
|
||
SPARKLE_PUBLIC_KEY="iT00+eUw/55obn1suEnWqI7za2pc8mHIFIdRbOWXW1Q="
|
||
|
||
echo "[build-app] generate app icon"
|
||
swift scripts/generate-app-icon.swift
|
||
|
||
echo "[build-app] swift build -c release"
|
||
swift build -c release --product "${APP_NAME}"
|
||
|
||
BIN_SRC=".build/release/${APP_NAME}"
|
||
[ -f "${BIN_SRC}" ] || { echo "missing ${BIN_SRC}"; exit 1; }
|
||
|
||
echo "[build-app] assemble bundle at ${APP_DIR}"
|
||
rm -rf "${APP_DIR}"
|
||
mkdir -p "${BIN_DIR}" "${RES_DIR}" "${FRAMEWORKS_DIR}"
|
||
cp "${BIN_SRC}" "${BIN_DIR}/${APP_NAME}"
|
||
cp "Resources/AppIcon.icns" "${RES_DIR}/AppIcon.icns"
|
||
cp "Resources/AppIcon.png" "${RES_DIR}/AppIcon.png"
|
||
|
||
# 嵌入 Sparkle.framework（含 Updater.app + XPC services + Autoupdate）。
|
||
# SPM 把 xcframework 解压到 .build/artifacts/sparkle/Sparkle/Sparkle.xcframework/，
|
||
# 选 macos-arm64_x86_64 那个 slice。整个 framework 一次性 cp -R 进去。
|
||
SPARKLE_FRAMEWORK_SRC=".build/artifacts/sparkle/Sparkle/Sparkle.xcframework/macos-arm64_x86_64/Sparkle.framework"
|
||
[ -d "${SPARKLE_FRAMEWORK_SRC}" ] || { echo "missing ${SPARKLE_FRAMEWORK_SRC} — 跑过 swift build 没？"; exit 1; }
|
||
echo "[build-app] embed Sparkle.framework"
|
||
cp -R "${SPARKLE_FRAMEWORK_SRC}" "${FRAMEWORKS_DIR}/Sparkle.framework"
|
||
|
||
cat > "${APP_DIR}/Contents/Info.plist" <<EOF
|
||
<?xml version="1.0" encoding="UTF-8"?>
|
||
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
|
||
<plist version="1.0">
|
||
<dict>
|
||
<key>CFBundleExecutable</key>
|
||
<string>${APP_NAME}</string>
|
||
<key>CFBundleIdentifier</key>
|
||
<string>${BUNDLE_ID}</string>
|
||
<key>CFBundleName</key>
|
||
<string>${APP_NAME}</string>
|
||
<key>CFBundleIconFile</key>
|
||
<string>AppIcon</string>
|
||
<key>CFBundleIconName</key>
|
||
<string>AppIcon</string>
|
||
<key>CFBundlePackageType</key>
|
||
<string>APPL</string>
|
||
<key>CFBundleShortVersionString</key>
|
||
<string>${APP_VERSION}</string>
|
||
<key>CFBundleVersion</key>
|
||
<string>${BUILD_NUMBER}</string>
|
||
<key>LSMinimumSystemVersion</key>
|
||
<string>15.0</string>
|
||
<key>NSPrincipalClass</key>
|
||
<string>NSApplication</string>
|
||
<key>NSMicrophoneUsageDescription</key>
|
||
<string>OpenLess 需要麦克风权限以录制您的语音并转写为文字。</string>
|
||
<key>NSAppleEventsUsageDescription</key>
|
||
<string>OpenLess 需要权限以将转写后的文字插入到您当前光标所在的输入框。</string>
|
||
<key>SUFeedURL</key>
|
||
<string>${SPARKLE_FEED_URL}</string>
|
||
<key>SUPublicEDKey</key>
|
||
<string>${SPARKLE_PUBLIC_KEY}</string>
|
||
<key>SUEnableAutomaticChecks</key>
|
||
<true/>
|
||
<key>SUEnableInstallerLauncherService</key>
|
||
<true/>
|
||
<key>SUScheduledCheckInterval</key>
|
||
<integer>3600</integer>
|
||
</dict>
|
||
</plist>
|
||
EOF
|
||
|
||
echo "[build-app] ad-hoc code sign (含 Sparkle helpers)"
|
||
# 顺序很重要：先签内层 helpers，最后签外层 .app；--deep 在 Sparkle 这种多层
|
||
# bundle 上不可靠（某些 XPC 会被漏签），所以显式逐个签。
|
||
SPARKLE_VERSIONS_DIR="${FRAMEWORKS_DIR}/Sparkle.framework/Versions/B"
|
||
codesign --force --sign - --timestamp=none \
|
||
"${SPARKLE_VERSIONS_DIR}/XPCServices/Installer.xpc" 2>/dev/null || true
|
||
codesign --force --sign - --timestamp=none \
|
||
"${SPARKLE_VERSIONS_DIR}/XPCServices/Downloader.xpc" 2>/dev/null || true
|
||
codesign --force --sign - --timestamp=none \
|
||
"${SPARKLE_VERSIONS_DIR}/Updater.app" 2>/dev/null || true
|
||
codesign --force --sign - --timestamp=none \
|
||
"${SPARKLE_VERSIONS_DIR}/Autoupdate" 2>/dev/null || true
|
||
codesign --force --sign - --timestamp=none \
|
||
"${FRAMEWORKS_DIR}/Sparkle.framework"
|
||
codesign --force --deep --sign - "${APP_DIR}"
|
||
|
||
echo "[build-app] kill old app"
|
||
killall "${APP_NAME}" 2>/dev/null || true
|
||
if [[ "${RESET_TCC:-1}" != "0" ]]; then
|
||
echo "[build-app] reset TCC approvals"
|
||
tccutil reset Accessibility "${BUNDLE_ID}" 2>/dev/null || true
|
||
tccutil reset Microphone "${BUNDLE_ID}" 2>/dev/null || true
|
||
tccutil reset AppleEvents "${BUNDLE_ID}" 2>/dev/null || true
|
||
tccutil reset ListenEvent "${BUNDLE_ID}" 2>/dev/null || true
|
||
else
|
||
echo "[build-app] keep existing TCC approvals"
|
||
fi
|
||
|
||
echo "[build-app] done: ${APP_DIR}"
|
||
echo
|
||
echo "下一步："
|
||
echo " 1. open ${APP_DIR} # 双击启动；默认已重置权限，会重新弹辅助功能 + 麦克风权限"
|
||
echo " 2. 系统设置 → 隐私与安全 → 辅助功能 / 麦克风 → 勾选 OpenLess"
|
||
echo " 3. 屏幕右上角菜单栏 OpenLess 图标 → 退出 OpenLess（必须先退出再重启）"
|
||
echo " 4. 再次 open ${APP_DIR}"
|
||
echo " 5. 从 Dock 或菜单栏打开 OpenLess 首页；在「设置」里填火山 APP ID、Access Token、Resource ID，以及 Ark API Key（保存到 ~/.openless/credentials.json，0600）"
|
||
echo " 6. 实时日志（另开终端）: tail -f ~/Library/Logs/OpenLess/OpenLess.log"
|
||
echo " 7. 按右 Option（或 Fn）开始录音；再按一次结束；语音文字会插入当前输入框"
|