Skip to content

Commit

Permalink
Add Library/QuickLook to the list of code resource bundles
Browse files Browse the repository at this point in the history 
Otherwise rcodesign signs QuickLook plugins twice!
  • Loading branch information
@dimula73
dimula73 committed Oct 8, 2024
1 parent 634c741 commit 06bbc7a
Show file tree
Hide file tree
Showing 11 changed files with 17 additions and 17 deletions.
2 changes: 1 addition & 1 deletion apple-codesign/src/code_resources.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -986,7 +986,7 @@ impl CodeResourcesBuilder {

slf.add_rule2(CodeResourcesRule::new("^.*")?);
slf.add_rule2(CodeResourcesRule::new("^[^/]+$")?.nested().weight(10));
slf.add_rule2(CodeResourcesRule::new("^(Frameworks|SharedFrameworks|PlugIns|Plug-ins|XPCServices|Helpers|MacOS|Library/(Automator|Spotlight|LoginItems))/")?
slf.add_rule2(CodeResourcesRule::new("^(Frameworks|SharedFrameworks|PlugIns|Plug-ins|XPCServices|Helpers|MacOS|Library/(Automator|Spotlight|QuickLook|LoginItems))/")?
.nested().weight(10));
slf.add_rule2(CodeResourcesRule::new(".*\\.dSYM($|/)")?.weight(11));
slf.add_rule2(
Expand Down
2 changes: 1 addition & 1 deletion apple-codesign/tests/cmd/sign-bundle-dsym.trycmd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ $ rcodesign print-signature-info MyApp.app.signed
- ' <key>weight</key>'
- ' <real>2000</real>'
- ' </dict>'
- ' <key>^(Frameworks|SharedFrameworks|PlugIns|Plug-ins|XPCServices|Helpers|MacOS|Library/(Automator|Spotlight|LoginItems))/</key>'
- ' <key>^(Frameworks|SharedFrameworks|PlugIns|Plug-ins|XPCServices|Helpers|MacOS|Library/(Automator|Spotlight|QuickLook|LoginItems))/</key>'
- ' <dict>'
- ' <key>nested</key>'
- ' <true/>'
Expand Down
8 changes: 4 additions & 4 deletions apple-codesign/tests/cmd/sign-bundle-electron.trycmd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -502,7 +502,7 @@ $ rcodesign print-signature-info Electron.app.signed
- ' <key>weight</key>'
- ' <real>2000</real>'
- ' </dict>'
- ' <key>^(Frameworks|SharedFrameworks|PlugIns|Plug-ins|XPCServices|Helpers|MacOS|Library/(Automator|Spotlight|LoginItems))/</key>'
- ' <key>^(Frameworks|SharedFrameworks|PlugIns|Plug-ins|XPCServices|Helpers|MacOS|Library/(Automator|Spotlight|QuickLook|LoginItems))/</key>'
- ' <dict>'
- ' <key>nested</key>'
- ' <true/>'
Expand Down Expand Up @@ -676,7 +676,7 @@ $ rcodesign print-signature-info Electron.app.signed
- ' <key>weight</key>'
- ' <real>2000</real>'
- ' </dict>'
- ' <key>^(Frameworks|SharedFrameworks|PlugIns|Plug-ins|XPCServices|Helpers|MacOS|Library/(Automator|Spotlight|LoginItems))/</key>'
- ' <key>^(Frameworks|SharedFrameworks|PlugIns|Plug-ins|XPCServices|Helpers|MacOS|Library/(Automator|Spotlight|QuickLook|LoginItems))/</key>'
- ' <dict>'
- ' <key>nested</key>'
- ' <true/>'
Expand Down Expand Up @@ -866,7 +866,7 @@ $ rcodesign print-signature-info Electron.app.signed
- ' <key>weight</key>'
- ' <real>2000</real>'
- ' </dict>'
- ' <key>^(Frameworks|SharedFrameworks|PlugIns|Plug-ins|XPCServices|Helpers|MacOS|Library/(Automator|Spotlight|LoginItems))/</key>'
- ' <key>^(Frameworks|SharedFrameworks|PlugIns|Plug-ins|XPCServices|Helpers|MacOS|Library/(Automator|Spotlight|QuickLook|LoginItems))/</key>'
- ' <dict>'
- ' <key>nested</key>'
- ' <true/>'
Expand Down Expand Up @@ -1114,7 +1114,7 @@ $ rcodesign print-signature-info Electron.app.signed
- ' <key>weight</key>'
- ' <real>2000</real>'
- ' </dict>'
- ' <key>^(Frameworks|SharedFrameworks|PlugIns|Plug-ins|XPCServices|Helpers|MacOS|Library/(Automator|Spotlight|LoginItems))/</key>'
- ' <key>^(Frameworks|SharedFrameworks|PlugIns|Plug-ins|XPCServices|Helpers|MacOS|Library/(Automator|Spotlight|QuickLook|LoginItems))/</key>'
- ' <dict>'
- ' <key>nested</key>'
- ' <true/>'
Expand Down
2 changes: 1 addition & 1 deletion apple-codesign/tests/cmd/sign-bundle-framework-shallow.trycmd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ $ rcodesign print-signature-info Shallow.framework.signed
- ' <key>weight</key>'
- ' <real>2000</real>'
- ' </dict>'
- ' <key>^(Frameworks|SharedFrameworks|PlugIns|Plug-ins|XPCServices|Helpers|MacOS|Library/(Automator|Spotlight|LoginItems))/</key>'
- ' <key>^(Frameworks|SharedFrameworks|PlugIns|Plug-ins|XPCServices|Helpers|MacOS|Library/(Automator|Spotlight|QuickLook|LoginItems))/</key>'
- ' <dict>'
- ' <key>nested</key>'
- ' <true/>'
Expand Down
2 changes: 1 addition & 1 deletion apple-codesign/tests/cmd/sign-bundle-framework.trycmd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ $ rcodesign print-signature-info MyFramework.framework.signed
- ' <key>weight</key>'
- ' <real>2000</real>'
- ' </dict>'
- ' <key>^(Frameworks|SharedFrameworks|PlugIns|Plug-ins|XPCServices|Helpers|MacOS|Library/(Automator|Spotlight|LoginItems))/</key>'
- ' <key>^(Frameworks|SharedFrameworks|PlugIns|Plug-ins|XPCServices|Helpers|MacOS|Library/(Automator|Spotlight|QuickLook|LoginItems))/</key>'
- ' <dict>'
- ' <key>nested</key>'
- ' <true/>'
Expand Down
2 changes: 1 addition & 1 deletion apple-codesign/tests/cmd/sign-bundle-macho-universal.trycmd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -366,7 +366,7 @@ $ rcodesign print-signature-info MyApp.app.signed
- ' <key>weight</key>'
- ' <real>2000</real>'
- ' </dict>'
- ' <key>^(Frameworks|SharedFrameworks|PlugIns|Plug-ins|XPCServices|Helpers|MacOS|Library/(Automator|Spotlight|LoginItems))/</key>'
- ' <key>^(Frameworks|SharedFrameworks|PlugIns|Plug-ins|XPCServices|Helpers|MacOS|Library/(Automator|Spotlight|QuickLook|LoginItems))/</key>'
- ' <dict>'
- ' <key>nested</key>'
- ' <true/>'
Expand Down
2 changes: 1 addition & 1 deletion apple-codesign/tests/cmd/sign-bundle-multiple-macho.trycmd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -347,7 +347,7 @@ $ rcodesign print-signature-info MyApp.app.signed
- ' <key>weight</key>'
- ' <real>2000</real>'
- ' </dict>'
- ' <key>^(Frameworks|SharedFrameworks|PlugIns|Plug-ins|XPCServices|Helpers|MacOS|Library/(Automator|Spotlight|LoginItems))/</key>'
- ' <key>^(Frameworks|SharedFrameworks|PlugIns|Plug-ins|XPCServices|Helpers|MacOS|Library/(Automator|Spotlight|QuickLook|LoginItems))/</key>'
- ' <dict>'
- ' <key>nested</key>'
- ' <true/>'
Expand Down
2 changes: 1 addition & 1 deletion apple-codesign/tests/cmd/sign-bundle-nested-macho-identifier.trycmd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,7 @@ $ rcodesign print-signature-info MyApp.app.signed
- ' <key>weight</key>'
- ' <real>2000</real>'
- ' </dict>'
- ' <key>^(Frameworks|SharedFrameworks|PlugIns|Plug-ins|XPCServices|Helpers|MacOS|Library/(Automator|Spotlight|LoginItems))/</key>'
- ' <key>^(Frameworks|SharedFrameworks|PlugIns|Plug-ins|XPCServices|Helpers|MacOS|Library/(Automator|Spotlight|QuickLook|LoginItems))/</key>'
- ' <dict>'
- ' <key>nested</key>'
- ' <true/>'
Expand Down
2 changes: 1 addition & 1 deletion apple-codesign/tests/cmd/sign-bundle-nested-symlinks.trycmd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ $ rcodesign print-signature-info MyApp.app.signed
- ' <key>weight</key>'
- ' <real>2000</real>'
- ' </dict>'
- ' <key>^(Frameworks|SharedFrameworks|PlugIns|Plug-ins|XPCServices|Helpers|MacOS|Library/(Automator|Spotlight|LoginItems))/</key>'
- ' <key>^(Frameworks|SharedFrameworks|PlugIns|Plug-ins|XPCServices|Helpers|MacOS|Library/(Automator|Spotlight|QuickLook|LoginItems))/</key>'
- ' <dict>'
- ' <key>nested</key>'
- ' <true/>'
Expand Down
6 changes: 3 additions & 3 deletions apple-codesign/tests/cmd/sign-bundle-with-nested-framework.trycmd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@ $ rcodesign print-signature-info MyApp.app.signed
- ' <key>weight</key>'
- ' <real>2000</real>'
- ' </dict>'
- ' <key>^(Frameworks|SharedFrameworks|PlugIns|Plug-ins|XPCServices|Helpers|MacOS|Library/(Automator|Spotlight|LoginItems))/</key>'
- ' <key>^(Frameworks|SharedFrameworks|PlugIns|Plug-ins|XPCServices|Helpers|MacOS|Library/(Automator|Spotlight|QuickLook|LoginItems))/</key>'
- ' <dict>'
- ' <key>nested</key>'
- ' <true/>'
Expand Down Expand Up @@ -533,7 +533,7 @@ $ rcodesign print-signature-info MyApp.app.signed
- ' <key>weight</key>'
- ' <real>2000</real>'
- ' </dict>'
- ' <key>^(Frameworks|SharedFrameworks|PlugIns|Plug-ins|XPCServices|Helpers|MacOS|Library/(Automator|Spotlight|LoginItems))/</key>'
- ' <key>^(Frameworks|SharedFrameworks|PlugIns|Plug-ins|XPCServices|Helpers|MacOS|Library/(Automator|Spotlight|QuickLook|LoginItems))/</key>'
- ' <dict>'
- ' <key>nested</key>'
- ' <true/>'
Expand Down Expand Up @@ -733,7 +733,7 @@ $ rcodesign print-signature-info MyApp.app.signed
- ' <key>weight</key>'
- ' <real>2000</real>'
- ' </dict>'
- ' <key>^(Frameworks|SharedFrameworks|PlugIns|Plug-ins|XPCServices|Helpers|MacOS|Library/(Automator|Spotlight|LoginItems))/</key>'
- ' <key>^(Frameworks|SharedFrameworks|PlugIns|Plug-ins|XPCServices|Helpers|MacOS|Library/(Automator|Spotlight|QuickLook|LoginItems))/</key>'
- ' <dict>'
- ' <key>nested</key>'
- ' <true/>'
Expand Down
4 changes: 2 additions & 2 deletions apple-codesign/tests/cmd/sign-bundle.trycmd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ $ rcodesign print-signature-info MyApp.app.signed
- ' <key>weight</key>'
- ' <real>2000</real>'
- ' </dict>'
- ' <key>^(Frameworks|SharedFrameworks|PlugIns|Plug-ins|XPCServices|Helpers|MacOS|Library/(Automator|Spotlight|LoginItems))/</key>'
- ' <key>^(Frameworks|SharedFrameworks|PlugIns|Plug-ins|XPCServices|Helpers|MacOS|Library/(Automator|Spotlight|QuickLook|LoginItems))/</key>'
- ' <dict>'
- ' <key>nested</key>'
- ' <true/>'
Expand Down Expand Up @@ -415,7 +415,7 @@ $ rcodesign print-signature-info MyApp.app.signed
- ' <key>weight</key>'
- ' <real>2000</real>'
- ' </dict>'
- ' <key>^(Frameworks|SharedFrameworks|PlugIns|Plug-ins|XPCServices|Helpers|MacOS|Library/(Automator|Spotlight|LoginItems))/</key>'
- ' <key>^(Frameworks|SharedFrameworks|PlugIns|Plug-ins|XPCServices|Helpers|MacOS|Library/(Automator|Spotlight|QuickLook|LoginItems))/</key>'
- ' <dict>'
- ' <key>nested</key>'
- ' <true/>'
Expand Down

0 comments on commit 06bbc7a

Please sign in to comment.