Skip to content

fix: sandbox entitlement, menu icons, and release packaging #125

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wflixu merged 5 commits into from
Jul 5, 2026
Merged

fix: sandbox entitlement, menu icons, and release packaging #125

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c638495
fix: add sandbox entitlement for FinderSyncExt and set icons for coll…
wflixu Jul 5, 2026
d6b21d4
chore: bump version to 2.0.4 (build 20260705001)
wflixu Jul 5, 2026
2491247
fix: prevent nested .app in release zip caused by stale DMG temp copy
wflixu Jul 5, 2026
7c71354
fix: isolate DMG and ZIP staging into separate subdirectories
wflixu Jul 5, 2026
9bb984a
chore: bump actions/checkout from v4 to v5
wflixu Jul 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/pr-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
runs-on: macos-latest
steps:
- name: Checkout
uses: actions/checkout@v4
uses: actions/checkout@v5

- name: Select Xcode
run: |
Expand Down
21 changes: 14 additions & 7 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
steps:
# --- 0. 准备工作 ---
- name: Checkout
uses: actions/checkout@v4
uses: actions/checkout@v5

- name: Select Xcode
run: |
Expand Down Expand Up @@ -201,7 +201,10 @@ jobs:
VERSION=${{ steps.version.outputs.version }}
DMG_NAME="${APP_NAME}-v${VERSION}.dmg"

cp -R "$APP_PATH" "./${APP_NAME}.app"
DMG_STAGING="dmg-staging"
rm -rf "$DMG_STAGING"
mkdir -p "$DMG_STAGING"
ditto "$APP_PATH" "$DMG_STAGING/${APP_NAME}.app"

create-dmg \
--volname "${APP_NAME}" \
Expand All @@ -212,10 +215,12 @@ jobs:
--hide-extension "${APP_NAME}.app" \
--app-drop-link 450 200 \
"$DMG_NAME" \
"./${APP_NAME}.app"
"$DMG_STAGING/${APP_NAME}.app"

codesign --force --sign "$CERT_NAME" "$DMG_NAME"

rm -rf "$DMG_STAGING"

echo "DMG_NAME=$DMG_NAME" >> $GITHUB_ENV

# --- 7b. DMG 公证 ---
Expand Down Expand Up @@ -255,10 +260,12 @@ jobs:
VERSION=${{ steps.version.outputs.version }}
ZIP_NAME="${APP_NAME}-v${VERSION}.app.zip"

# 复制到当前目录再压缩，保留 .app 层级
cp -R "$APP_PATH" "./${APP_NAME}.app"
ditto -c -k --sequesterRsrc --keepParent "./${APP_NAME}.app" "$ZIP_NAME"
rm -rf "./${APP_NAME}.app"
ZIP_STAGING="zip-staging"
rm -rf "$ZIP_STAGING"
mkdir -p "$ZIP_STAGING"
ditto "$APP_PATH" "$ZIP_STAGING/${APP_NAME}.app"
ditto -c -k --sequesterRsrc --keepParent "$ZIP_STAGING/${APP_NAME}.app" "$ZIP_NAME"
rm -rf "$ZIP_STAGING"

SHA256=$(shasum -a 256 "$ZIP_NAME" | awk '{print $1}')
printf '%s %s\n' "$SHA256" "$ZIP_NAME" > "${ZIP_NAME}.sha256"
Expand Down
2 changes: 2 additions & 0 deletions FinderSyncExt/FinderSyncExt.entitlements
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,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>com.apple.security.app-sandbox</key>
<true/>
<key>com.apple.security.application-groups</key>
<array>
<string>group.cn.wflixu.RClick</string>
Expand Down
2 changes: 2 additions & 0 deletions FinderSyncExt/FinderSyncExt.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,6 +280,7 @@ class FinderSyncExt: FIFinderSync, @unchecked Sendable {
}
let actionsItem = NSMenuItem(title: actionsTitle, action: nil, keyEquivalent: "")
actionsItem.submenu = actionsSubMenu
actionsItem.image = templateSymbol("ellipsis.circle")
menu.addItem(actionsItem)
} else {
// 不折叠：直接显示菜单项
Expand Down Expand Up @@ -310,6 +311,7 @@ class FinderSyncExt: FIFinderSync, @unchecked Sendable {
}
let appsItem = NSMenuItem(title: appsTitle, action: nil, keyEquivalent: "")
appsItem.submenu = appsSubMenu
appsItem.image = templateSymbol("square.and.arrow.up.on.square")
menu.addItem(appsItem)
} else {
// 不折叠：直接显示菜单项
Expand Down
16 changes: 8 additions & 8 deletions RClick.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -552,7 +552,7 @@
CODE_SIGN_ENTITLEMENTS = RClick/RClickDebug.entitlements;
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 20260704002;
CURRENT_PROJECT_VERSION = 20260705001;
DEAD_CODE_STRIPPING = YES;
DEVELOPMENT_TEAM = 4L3563XCBN;
ENABLE_APP_SANDBOX = YES;
Expand All @@ -568,7 +568,7 @@
"@executable_path/../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 15.6;
MARKETING_VERSION = 2.0.3;
MARKETING_VERSION = 2.0.4;
PRODUCT_BUNDLE_IDENTIFIER = cn.wflixu.RClick;
PRODUCT_NAME = "$(TARGET_NAME)";
REGISTER_APP_GROUPS = YES;
Expand All @@ -590,7 +590,7 @@
CODE_SIGN_ENTITLEMENTS = RClick/RClick.entitlements;
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 20260704002;
CURRENT_PROJECT_VERSION = 20260705001;
DEAD_CODE_STRIPPING = YES;
DEVELOPMENT_TEAM = 4L3563XCBN;
ENABLE_APP_SANDBOX = YES;
Expand All @@ -606,7 +606,7 @@
"@executable_path/../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 15.6;
MARKETING_VERSION = 2.0.3;
MARKETING_VERSION = 2.0.4;
PRODUCT_BUNDLE_IDENTIFIER = cn.wflixu.RClick;
PRODUCT_NAME = "$(TARGET_NAME)";
REGISTER_APP_GROUPS = YES;
Expand Down Expand Up @@ -669,7 +669,7 @@
CODE_SIGN_ENTITLEMENTS = FinderSyncExt/FinderSyncExt.entitlements;
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 20260704002;
CURRENT_PROJECT_VERSION = 20260705001;
DEAD_CODE_STRIPPING = YES;
DEVELOPMENT_TEAM = 4L3563XCBN;
ENABLE_APP_SANDBOX = YES;
Expand All @@ -685,7 +685,7 @@
"@executable_path/../../../../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 15.6;
MARKETING_VERSION = 2.0.3;
MARKETING_VERSION = 2.0.4;
PRODUCT_BUNDLE_IDENTIFIER = cn.wflixu.RClick.FinderSyncExt;
PRODUCT_NAME = "$(TARGET_NAME)";
REGISTER_APP_GROUPS = YES;
Expand All @@ -704,7 +704,7 @@
CODE_SIGN_ENTITLEMENTS = FinderSyncExt/FinderSyncExt.entitlements;
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 20260704002;
CURRENT_PROJECT_VERSION = 20260705001;
DEAD_CODE_STRIPPING = YES;
DEVELOPMENT_TEAM = 4L3563XCBN;
ENABLE_APP_SANDBOX = YES;
Expand All @@ -720,7 +720,7 @@
"@executable_path/../../../../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 15.6;
MARKETING_VERSION = 2.0.3;
MARKETING_VERSION = 2.0.4;
PRODUCT_BUNDLE_IDENTIFIER = cn.wflixu.RClick.FinderSyncExt;
PRODUCT_NAME = "$(TARGET_NAME)";
REGISTER_APP_GROUPS = YES;
Expand Down
Loading