Skip to content

CodexBar 是一个 macOS 菜单栏应用,用于查看本机 Codex 账号状态、额度、Token 用量、详细统计信息

chore: 精简更新逻辑并发布 1.2.1

Bob583e6fb971b0
diff --git a/CodexBar.xcodeproj/project.pbxproj b/CodexBar.xcodeproj/project.pbxproj
index 92ed637..bc6269f 100644
--- a/CodexBar.xcodeproj/project.pbxproj
+++ b/CodexBar.xcodeproj/project.pbxproj
@@ -275,7 +275,7 @@
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
- CURRENT_PROJECT_VERSION = 1;
+ CURRENT_PROJECT_VERSION = 2;
DEVELOPMENT_TEAM = 4KJ362VJW5;
ENABLE_APP_INTENTS_METADATA_GENERATION = NO;
ENABLE_APP_SANDBOX = NO;
@@ -290,7 +290,7 @@
"$(inherited)",
"@executable_path/../Frameworks",
);
- MARKETING_VERSION = 1.2.0;
+ MARKETING_VERSION = 1.2.1;
PRODUCT_BUNDLE_IDENTIFIER = app.zabrian.codexbar;
PRODUCT_NAME = "$(TARGET_NAME)";
REGISTER_APP_GROUPS = YES;
@@ -312,7 +312,7 @@
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
- CURRENT_PROJECT_VERSION = 1;
+ CURRENT_PROJECT_VERSION = 2;
DEVELOPMENT_TEAM = 4KJ362VJW5;
ENABLE_APP_INTENTS_METADATA_GENERATION = NO;
ENABLE_APP_SANDBOX = NO;
@@ -327,7 +327,7 @@
"$(inherited)",
"@executable_path/../Frameworks",
);
- MARKETING_VERSION = 1.2.0;
+ MARKETING_VERSION = 1.2.1;
PRODUCT_BUNDLE_IDENTIFIER = app.zabrian.codexbar;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
diff --git a/CodexBar/AppUpdater.swift b/CodexBar/AppUpdater.swift
index eaef939..c5b689f 100644
--- a/CodexBar/AppUpdater.swift
+++ b/CodexBar/AppUpdater.swift
@@ -6,6 +6,7 @@
//
import Combine
+import AppKit
import Sparkle
import SwiftUI
@@ -15,6 +16,7 @@ final class AppUpdater: NSObject, ObservableObject {
private var updaterController: SPUStandardUpdaterController?
private var clearStatusMessageTask: Task<Void, Never>?
+ private var hasAvailableUpdate = false
init(bundle: Bundle = .main) {
super.init()
@@ -36,42 +38,51 @@ final class AppUpdater: NSObject, ObservableObject {
return
}
+ if hasAvailableUpdate {
+ NSApplication.shared.activate()
+ updaterController.checkForUpdates(nil)
+ return
+ }
+
showStatusMessage("正在检查更新")
- updaterController.checkForUpdates(nil)
+ updaterController.updater.checkForUpdateInformation()
}
- private func showStatusMessage(_ message: String) {
+ private func showStatusMessage(_ message: String, autoDismiss: Bool = true) {
clearStatusMessageTask?.cancel()
statusMessage = message
-
+
+ guard autoDismiss else { return }
+
clearStatusMessageTask = Task { [weak self] in
try? await Task.sleep(for: .seconds(3))
guard !Task.isCancelled else { return }
self?.statusMessage = nil
}
}
-
+
private static func hasUsableSparkleConfiguration(in bundle: Bundle) -> Bool {
guard
let feedURLString = bundle.object(forInfoDictionaryKey: "SUFeedURL") as? String,
- let feedURL = URL(string: feedURLString),
- ["https", "http"].contains(feedURL.scheme?.lowercased()),
- let publicKey = bundle.object(forInfoDictionaryKey: "SUPublicEDKey") as? String,
- !publicKey.isEmpty
+ let scheme = URL(string: feedURLString)?.scheme?.lowercased(),
+ scheme == "https" || scheme == "http",
+ let publicKey = bundle.object(forInfoDictionaryKey: "SUPublicEDKey") as? String
else {
return false
}
- return true
+ return !publicKey.isEmpty
}
}
extension AppUpdater: SPUUpdaterDelegate {
func updater(_ updater: SPUUpdater, didFindValidUpdate item: SUAppcastItem) {
- showStatusMessage("发现新版本 v\(item.displayVersionString)")
+ hasAvailableUpdate = true
+ showStatusMessage("发现新版本 v\(item.displayVersionString)", autoDismiss: false)
}
-
+
func updaterDidNotFindUpdate(_ updater: SPUUpdater, error: Error) {
+ hasAvailableUpdate = false
showStatusMessage("已是最新版本")
}
}
diff --git a/CodexBar/RateLimitsMenuView.swift b/CodexBar/RateLimitsMenuView.swift
index f3e3c63..4f2fbdc 100644
--- a/CodexBar/RateLimitsMenuView.swift
+++ b/CodexBar/RateLimitsMenuView.swift
@@ -219,8 +219,7 @@ private extension RateLimitsMenuView {
static let appVersionLabel: String = {
let version = Bundle.main.object(forInfoDictionaryKey: "CFBundleShortVersionString") as? String ?? "--"
- let build = Bundle.main.object(forInfoDictionaryKey: "CFBundleVersion") as? String ?? "-"
- return "App 版本: v\(version) (\(build))"
+ return "App 版本: v\(version)"
}()
}
diff --git a/Scripts/create-dmg.sh b/Scripts/create-dmg.sh
index e73f922..33546ba 100755
--- a/Scripts/create-dmg.sh
+++ b/Scripts/create-dmg.sh
@@ -8,31 +8,31 @@ APP_PATH="${1:-}"
OUTPUT_PATH="${2:-}"
if [[ -z "${APP_PATH}" ]]; then
- apps=()
- while IFS= read -r app; do
- apps+=("${app}")
- done < <(find "${PROJECT_DIR}" -maxdepth 1 -type d -name "*.app" | sort)
-
- if [[ "${#apps[@]}" -eq 0 ]]; then
- echo "error: 当前目录没有找到 .app" >&2
- echo "usage: Scripts/create-dmg.sh [App.app] [Output.dmg]" >&2
- exit 1
- fi
-
- if [[ "${#apps[@]}" -gt 1 ]]; then
- echo "error: 当前目录找到多个 .app, 请指定要打包的 app 路径: " >&2
- printf ' %s\n' "${apps[@]}" >&2
- exit 1
- fi
-
- APP_PATH="${apps[0]}"
+ apps=()
+ while IFS= read -r app; do
+ apps+=("${app}")
+ done < <(find "${PROJECT_DIR}" -maxdepth 1 -type d -name "*.app" | sort)
+
+ if [[ "${#apps[@]}" -eq 0 ]]; then
+ echo "error: 当前目录没有找到 .app" >&2
+ echo "usage: Scripts/create-dmg.sh [App.app] [Output.dmg]" >&2
+ exit 1
+ fi
+
+ if [[ "${#apps[@]}" -gt 1 ]]; then
+ echo "error: 当前目录找到多个 .app, 请指定要打包的 app 路径: " >&2
+ printf ' %s\n' "${apps[@]}" >&2
+ exit 1
+ fi
+
+ APP_PATH="${apps[0]}"
elif [[ "${APP_PATH}" != /* ]]; then
- APP_PATH="${PROJECT_DIR}/${APP_PATH}"
+ APP_PATH="${PROJECT_DIR}/${APP_PATH}"
fi
if [[ ! -d "${APP_PATH}" || "${APP_PATH}" != *.app ]]; then
- echo "error: app 路径无效: ${APP_PATH}" >&2
- exit 1
+ echo "error: app 路径无效: ${APP_PATH}" >&2
+ exit 1
fi
APP_NAME="$(basename "${APP_PATH}" .app)"
@@ -42,29 +42,29 @@ XCODE_SCHEME="${XCODE_SCHEME:-${APP_NAME}}"
VERSION=""
if [[ -z "${XCODE_PROJECT}" ]]; then
- while IFS= read -r project; do
- XCODE_PROJECT="${project}"
- break
- done < <(find "${PROJECT_DIR}" -maxdepth 1 -type d -name "*.xcodeproj" | sort)
+ while IFS= read -r project; do
+ XCODE_PROJECT="${project}"
+ break
+ done < <(find "${PROJECT_DIR}" -maxdepth 1 -type d -name "*.xcodeproj" | sort)
elif [[ "${XCODE_PROJECT}" != /* ]]; then
- XCODE_PROJECT="${PROJECT_DIR}/${XCODE_PROJECT}"
+ XCODE_PROJECT="${PROJECT_DIR}/${XCODE_PROJECT}"
fi
if [[ -n "${XCODE_PROJECT}" && -d "${XCODE_PROJECT}" ]]; then
- VERSION="$(
- xcodebuild \
- -project "${XCODE_PROJECT}" \
- -scheme "${XCODE_SCHEME}" \
- -configuration Release \
- -showBuildSettings 2>/dev/null \
- | awk -F= '/MARKETING_VERSION/ {gsub(/[[:space:]]/, "", $2); print $2; exit}' \
- || true
- )"
+ VERSION="$(
+ xcodebuild \
+ -project "${XCODE_PROJECT}" \
+ -scheme "${XCODE_SCHEME}" \
+ -configuration Release \
+ -showBuildSettings 2>/dev/null |
+ awk -F= '/MARKETING_VERSION/ {gsub(/[[:space:]]/, "", $2); print $2; exit}' ||
+ true
+ )"
fi
if [[ -z "${VERSION}" && -n "${XCODE_PROJECT}" && -d "${XCODE_PROJECT}" ]]; then
- VERSION="$(
- awk -F= '
+ VERSION="$(
+ awk -F= '
/MARKETING_VERSION/ {
value = $2
gsub(/[[:space:];]/, "", value)
@@ -72,22 +72,22 @@ if [[ -z "${VERSION}" && -n "${XCODE_PROJECT}" && -d "${XCODE_PROJECT}" ]]; then
exit
}
' "${XCODE_PROJECT}/project.pbxproj" 2>/dev/null || true
- )"
+ )"
fi
if [[ -z "${VERSION}" && -f "${PLIST_PATH}" ]]; then
- VERSION="$(/usr/libexec/PlistBuddy -c 'Print :CFBundleShortVersionString' "${PLIST_PATH}" 2>/dev/null || true)"
+ VERSION="$(/usr/libexec/PlistBuddy -c 'Print :CFBundleShortVersionString' "${PLIST_PATH}" 2>/dev/null || true)"
fi
if [[ -z "${VERSION}" ]]; then
- echo "error: 无法从 Xcode 或 Info.plist 读取版本号" >&2
- exit 1
+ echo "error: 无法从 Xcode 或 Info.plist 读取版本号" >&2
+ exit 1
fi
if [[ -z "${OUTPUT_PATH}" ]]; then
- OUTPUT_PATH="${PROJECT_DIR}/${APP_NAME}-v${VERSION}.dmg"
+ OUTPUT_PATH="${PROJECT_DIR}/${APP_NAME}-v${VERSION}.dmg"
elif [[ "${OUTPUT_PATH}" != /* ]]; then
- OUTPUT_PATH="${PROJECT_DIR}/${OUTPUT_PATH}"
+ OUTPUT_PATH="${PROJECT_DIR}/${OUTPUT_PATH}"
fi
DIST_DIR="$(dirname "${OUTPUT_PATH}")"
@@ -98,20 +98,20 @@ STAGING_DIR="$(mktemp -d "/private/tmp/${APP_NAME}DMGStage.XXXXXX")"
MOUNT_POINT=""
cleanup() {
- if [[ -n "${MOUNT_POINT}" ]]; then
- hdiutil detach "${MOUNT_POINT}" >/dev/null 2>&1 || true
- fi
+ if [[ -n "${MOUNT_POINT}" ]]; then
+ hdiutil detach "${MOUNT_POINT}" >/dev/null 2>&1 || true
+ fi
- rm -rf "${STAGING_DIR}"
- rm -f "${RW_DMG}" "${TEMP_OUTPUT_PATH}"
+ rm -rf "${STAGING_DIR}"
+ rm -f "${RW_DMG}" "${TEMP_OUTPUT_PATH}"
}
trap cleanup EXIT
require_command() {
- if ! command -v "$1" >/dev/null 2>&1; then
- echo "error: 缺少命令: $1" >&2
- exit 1
- fi
+ if ! command -v "$1" >/dev/null 2>&1; then
+ echo "error: 缺少命令: $1" >&2
+ exit 1
+ fi
}
require_command hdiutil
@@ -127,20 +127,20 @@ ln -sfn /Applications "${STAGING_DIR}/Applications"
echo "==> Creating writable DMG"
hdiutil create \
- -volname "${VOLUME_NAME}" \
- -srcfolder "${STAGING_DIR}" \
- -ov \
- -format UDRW \
- "${RW_DMG}" >/dev/null
+ -volname "${VOLUME_NAME}" \
+ -srcfolder "${STAGING_DIR}" \
+ -ov \
+ -format UDRW \
+ "${RW_DMG}" >/dev/null
echo "==> Mounting writable DMG"
ATTACH_OUTPUT="$(hdiutil attach -readwrite -noverify -noautoopen "${RW_DMG}")"
MOUNT_POINT="$(printf '%s\n' "${ATTACH_OUTPUT}" | awk '/\/Volumes\// {print substr($0, index($0, "/Volumes/")); exit}')"
if [[ -z "${MOUNT_POINT}" || ! -d "${MOUNT_POINT}" ]]; then
- echo "error: 挂载 DMG 失败" >&2
- printf '%s\n' "${ATTACH_OUTPUT}" >&2
- exit 1
+ echo "error: 挂载 DMG 失败" >&2
+ printf '%s\n' "${ATTACH_OUTPUT}" >&2
+ exit 1
fi
echo "==> Writing Finder layout"
@@ -171,9 +171,9 @@ APPLESCRIPT
DS_STORE="${MOUNT_POINT}/.DS_Store"
if [[ ! -s "${DS_STORE}" ]]; then
- echo "warning: 没有写入 .DS_Store 窗口布局不会生效" >&2
+ echo "warning: 没有写入 .DS_Store 窗口布局不会生效" >&2
else
- echo "==> Finder layout saved"
+ echo "==> Finder layout saved"
fi
sync
@@ -182,11 +182,11 @@ MOUNT_POINT=""
echo "==> Creating compressed DMG"
hdiutil convert \
- "${RW_DMG}" \
- -format UDZO \
- -imagekey zlib-level=9 \
- -ov \
- -o "${TEMP_OUTPUT_PATH}" >/dev/null
+ "${RW_DMG}" \
+ -format UDZO \
+ -imagekey zlib-level=9 \
+ -ov \
+ -o "${TEMP_OUTPUT_PATH}" >/dev/null
mv -f "${TEMP_OUTPUT_PATH}" "${OUTPUT_PATH}"
diff --git a/Scripts/update-appcast.sh b/Scripts/update-appcast.sh
index 560d957..6605c26 100755
--- a/Scripts/update-appcast.sh
+++ b/Scripts/update-appcast.sh
@@ -15,7 +15,7 @@ XCODE_PROJECT="${XCODE_PROJECT:-}"
XCODE_SCHEME="${XCODE_SCHEME:-CodexBar}"
usage() {
- cat >&2 <<USAGE
+ cat >&2 <<USAGE
usage: Scripts/update-appcast.sh [CodexBar-vX.Y.Z.dmg]
Environment:
@@ -33,24 +33,24 @@ USAGE
}
require_command() {
- if ! command -v "$1" >/dev/null 2>&1; then
- echo "error: missing command: $1" >&2
- exit 1
- fi
+ if ! command -v "$1" >/dev/null 2>&1; then
+ echo "error: missing command: $1" >&2
+ exit 1
+ fi
}
xml_escape() {
- sed \
- -e 's/&/\&amp;/g' \
- -e 's/</\&lt;/g' \
- -e 's/>/\&gt;/g' \
- -e 's/"/\&quot;/g'
+ sed \
+ -e 's/&/\&amp;/g' \
+ -e 's/</\&lt;/g' \
+ -e 's/>/\&gt;/g' \
+ -e 's/"/\&quot;/g'
}
read_build_setting() {
- local name="$1"
- printf '%s\n' "${BUILD_SETTINGS}" \
- | awk -F= -v key="${name}" '
+ local name="$1"
+ printf '%s\n' "${BUILD_SETTINGS}" |
+ awk -F= -v key="${name}" '
$1 ~ key {
value = $2
gsub(/^[[:space:]]+|[[:space:]]+$/, "", value)
@@ -60,68 +60,62 @@ read_build_setting() {
'
}
+# Print the single project-root entry matching a glob, or fail:
+# $1 noun for "no X found" $2 find -type $3 -name glob
+# $4 noun for "multiple X found" $5 hint appended to the multiple-match error
+# Exits 1 when nothing matches, 2 when more than one matches (printing the list).
+find_single() {
+ local items=()
+ while IFS= read -r item; do
+ items+=("${item}")
+ done < <(find "${PROJECT_DIR}" -maxdepth 1 -type "$2" -name "$3" | sort)
+
+ if [[ "${#items[@]}" -eq 0 ]]; then
+ echo "error: no $1 found in project root" >&2
+ return 1
+ fi
+
+ if [[ "${#items[@]}" -gt 1 ]]; then
+ echo "error: multiple $4 found; $5" >&2
+ printf ' %s\n' "${items[@]}" >&2
+ return 2
+ fi
+
+ printf '%s\n' "${items[0]}"
+}
+
if [[ "${DMG_PATH}" == "-h" || "${DMG_PATH}" == "--help" ]]; then
- usage
- exit 0
+ usage
+ exit 0
fi
if [[ -z "${DMG_PATH}" ]]; then
- dmgs=()
- while IFS= read -r dmg; do
- dmgs+=("${dmg}")
- done < <(find "${PROJECT_DIR}" -maxdepth 1 -type f -name "*.dmg" | sort)
-
- if [[ "${#dmgs[@]}" -eq 0 ]]; then
- echo "error: no DMG found in project root" >&2
- usage
- exit 1
- fi
-
- if [[ "${#dmgs[@]}" -gt 1 ]]; then
- echo "error: multiple DMGs found; specify one explicitly:" >&2
- printf ' %s\n' "${dmgs[@]}" >&2
- exit 1
- fi
-
- DMG_PATH="${dmgs[0]}"
+ DMG_PATH="$(find_single DMG f '*.dmg' DMGs 'specify one explicitly:')" || {
+ [[ "$?" -eq 1 ]] && usage
+ exit 1
+ }
elif [[ "${DMG_PATH}" != /* ]]; then
- DMG_PATH="${PROJECT_DIR}/${DMG_PATH}"
+ DMG_PATH="${PROJECT_DIR}/${DMG_PATH}"
fi
if [[ ! -f "${DMG_PATH}" || "${DMG_PATH}" != *.dmg ]]; then
- echo "error: invalid DMG path: ${DMG_PATH}" >&2
- exit 1
+ echo "error: invalid DMG path: ${DMG_PATH}" >&2
+ exit 1
fi
if [[ "${APPCAST_PATH}" != /* ]]; then
- APPCAST_PATH="${PROJECT_DIR}/${APPCAST_PATH}"
+ APPCAST_PATH="${PROJECT_DIR}/${APPCAST_PATH}"
fi
if [[ ! -f "${APPCAST_PATH}" ]]; then
- echo "error: appcast not found: ${APPCAST_PATH}" >&2
- exit 1
+ echo "error: appcast not found: ${APPCAST_PATH}" >&2
+ exit 1
fi
if [[ -z "${XCODE_PROJECT}" ]]; then
- projects=()
- while IFS= read -r project; do
- projects+=("${project}")
- done < <(find "${PROJECT_DIR}" -maxdepth 1 -type d -name "*.xcodeproj" | sort)
-
- if [[ "${#projects[@]}" -eq 0 ]]; then
- echo "error: no .xcodeproj found in project root" >&2
- exit 1
- fi
-
- if [[ "${#projects[@]}" -gt 1 ]]; then
- echo "error: multiple .xcodeproj files found; set XCODE_PROJECT" >&2
- printf ' %s\n' "${projects[@]}" >&2
- exit 1
- fi
-
- XCODE_PROJECT="${projects[0]}"
+ XCODE_PROJECT="$(find_single .xcodeproj d '*.xcodeproj' '.xcodeproj files' 'set XCODE_PROJECT')" || exit 1
elif [[ "${XCODE_PROJECT}" != /* ]]; then
- XCODE_PROJECT="${PROJECT_DIR}/${XCODE_PROJECT}"
+ XCODE_PROJECT="${PROJECT_DIR}/${XCODE_PROJECT}"
fi
require_command xcodebuild
@@ -129,11 +123,11 @@ require_command perl
require_command stat
BUILD_SETTINGS="$(
- xcodebuild \
- -project "${XCODE_PROJECT}" \
- -scheme "${XCODE_SCHEME}" \
- -configuration Release \
- -showBuildSettings 2>/dev/null
+ xcodebuild \
+ -project "${XCODE_PROJECT}" \
+ -scheme "${XCODE_SCHEME}" \
+ -configuration Release \
+ -showBuildSettings 2>/dev/null
)"
SHORT_VERSION="$(read_build_setting MARKETING_VERSION)"
@@ -141,57 +135,58 @@ BUILD_VERSION="$(read_build_setting CURRENT_PROJECT_VERSION)"
PRODUCT_NAME="$(read_build_setting PRODUCT_NAME)"
if [[ -z "${SHORT_VERSION}" || -z "${BUILD_VERSION}" ]]; then
- echo "error: unable to read MARKETING_VERSION or CURRENT_PROJECT_VERSION" >&2
- exit 1
+ echo "error: unable to read MARKETING_VERSION or CURRENT_PROJECT_VERSION" >&2
+ exit 1
fi
if [[ -z "${PRODUCT_NAME}" || "${PRODUCT_NAME}" == '$(TARGET_NAME)' ]]; then
- PRODUCT_NAME="$(basename "${DMG_PATH}")"
- PRODUCT_NAME="${PRODUCT_NAME%%-v*}"
- PRODUCT_NAME="${PRODUCT_NAME%.dmg}"
+ PRODUCT_NAME="$(basename "${DMG_PATH}")"
+ PRODUCT_NAME="${PRODUCT_NAME%%-v*}"
+ PRODUCT_NAME="${PRODUCT_NAME%.dmg}"
fi
if [[ -z "${SIGN_UPDATE}" ]]; then
- if command -v sign_update >/dev/null 2>&1; then
- SIGN_UPDATE="$(command -v sign_update)"
- else
- SIGN_UPDATE="$(
- find "${HOME}/Library/Developer/Xcode/DerivedData" \
- -path "*Sparkle*/bin/sign_update" \
- -type f \
- 2>/dev/null \
- | sort \
- | tail -n 1
- )"
- fi
+ if command -v sign_update >/dev/null 2>&1; then
+ SIGN_UPDATE="$(command -v sign_update)"
+ else
+ SIGN_UPDATE="$(
+ find "${HOME}/Library/Developer/Xcode/DerivedData" \
+ -maxdepth 8 \
+ -path "*/SourcePackages/artifacts/*sparkle*/Sparkle/bin/sign_update" \
+ -type f \
+ 2>/dev/null |
+ sort |
+ tail -n 1
+ )"
+ fi
fi
if [[ -z "${SIGN_UPDATE}" || ! -x "${SIGN_UPDATE}" ]]; then
- echo "error: Sparkle sign_update not found; set SIGN_UPDATE=/path/to/sign_update" >&2
- exit 1
+ echo "error: Sparkle sign_update not found; set SIGN_UPDATE=/path/to/sign_update" >&2
+ exit 1
fi
echo "==> Signing update archive"
SIGN_OUTPUT="$("${SIGN_UPDATE}" "${DMG_PATH}")"
ED_SIGNATURE="$(
- printf '%s\n' "${SIGN_OUTPUT}" \
- | sed -n 's/.*sparkle:edSignature="\([^"]*\)".*/\1/p' \
- | head -n 1
+ printf '%s\n' "${SIGN_OUTPUT}" |
+ sed -n 's/.*sparkle:edSignature="\([^"]*\)".*/\1/p' |
+ head -n 1
)"
ARCHIVE_LENGTH="$(
- printf '%s\n' "${SIGN_OUTPUT}" \
- | sed -n 's/.*length="\([^"]*\)".*/\1/p' \
- | head -n 1
+ printf '%s\n' "${SIGN_OUTPUT}" |
+ sed -n 's/.*length="\([^"]*\)".*/\1/p' |
+ head -n 1
)"
if [[ -z "${ED_SIGNATURE}" ]]; then
- echo "error: unable to parse sparkle:edSignature from sign_update output" >&2
- printf '%s\n' "${SIGN_OUTPUT}" >&2
- exit 1
+ echo "error: unable to parse sparkle:edSignature from sign_update output" >&2
+ printf '%s\n' "${SIGN_OUTPUT}" >&2
+ exit 1
fi
if [[ -z "${ARCHIVE_LENGTH}" ]]; then
- ARCHIVE_LENGTH="$(stat -f%z "${DMG_PATH}")"
+ ARCHIVE_LENGTH="$(stat -f%z "${DMG_PATH}")"
fi
DOWNLOAD_URL="${DOWNLOAD_BASE_URL%/}/$(basename "${DMG_PATH}")"
@@ -203,9 +198,9 @@ MIN_SYSTEM_ESCAPED="$(printf '%s' "${MINIMUM_SYSTEM_VERSION}" | xml_escape)"
RELEASE_NOTES_XML=""
if [[ "${INCLUDE_RELEASE_NOTES}" != "0" ]]; then
- RELEASE_NOTES_URL="${RELEASE_NOTES_BASE_URL%/}/${SHORT_VERSION}.html"
- RELEASE_NOTES_URL_ESCAPED="$(printf '%s' "${RELEASE_NOTES_URL}" | xml_escape)"
- RELEASE_NOTES_XML="<sparkle:releaseNotesLink>${RELEASE_NOTES_URL_ESCAPED}</sparkle:releaseNotesLink>
+ RELEASE_NOTES_URL="${RELEASE_NOTES_BASE_URL%/}/${SHORT_VERSION}.html"
+ RELEASE_NOTES_URL_ESCAPED="$(printf '%s' "${RELEASE_NOTES_URL}" | xml_escape)"
+ RELEASE_NOTES_XML="<sparkle:releaseNotesLink>${RELEASE_NOTES_URL_ESCAPED}</sparkle:releaseNotesLink>
"
fi
@@ -231,7 +226,7 @@ APPCAST_ITEM="${APPCAST_ITEM}" APPCAST_VERSION="${BUILD_VERSION}" perl -0pi -e '
' "${APPCAST_PATH}"
if command -v xmllint >/dev/null 2>&1; then
- xmllint --noout "${APPCAST_PATH}"
+ xmllint --noout "${APPCAST_PATH}"
fi
echo "==> Added ${PRODUCT_NAME} ${SHORT_VERSION} (${BUILD_VERSION})"
diff --git a/Updates/appcast.xml b/Updates/appcast.xml
index f1dce61..e2d9160 100644
--- a/Updates/appcast.xml
+++ b/Updates/appcast.xml
@@ -7,6 +7,15 @@
<link>https://codexbar.zabrian.app/appcast.xml</link>
<description>CodexBar appcast feed</description>
<language>zh-CN</language>
+ <item>
+ <title>CodexBar.app 1.2.1</title>
+ <sparkle:version>2</sparkle:version>
+ <sparkle:shortVersionString>1.2.1</sparkle:shortVersionString>
+ <sparkle:minimumSystemVersion>15.0</sparkle:minimumSystemVersion>
+ <sparkle:releaseNotesLink>https://codexbar.zabrian.app/notes/1.2.1.html</sparkle:releaseNotesLink>
+ <pubDate>Thu, 11 Jun 2026 21:47:07 +0800</pubDate>
+ <enclosure url="https://codexbar.zabrian.app/download/CodexBar-v1.2.1.dmg" sparkle:edSignature="28wK6sVULaMiv6vL2nG+I2AYVtgJN1AKVDWhfYebKYdldbKmz4aOmggolKlXk9F2p1IlctC+713KIvPeRwWcCw==" length="1323377" type="application/octet-stream"/>
+ </item>
<item>
<title>CodexBar.app 1.2.0</title>
<sparkle:version>1</sparkle:version>