Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
B
brew
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Jira
External wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
guange
brew
Commits
cc0a249f
Unverified
Commit
cc0a249f
authored
1 year ago
by
Bo Anderson
Browse files
Options
Downloads
Patches
Plain Diff
unpack_strategy/zip: fix super ancestor on macOS without Sorbet Runtime
parent
8fbe9275
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
Library/Homebrew/extend/os/mac/unpack_strategy/zip.rb
+2
-5
2 additions, 5 deletions
Library/Homebrew/extend/os/mac/unpack_strategy/zip.rb
Library/Homebrew/extend/os/mac/unpack_strategy/zip.rbi
+1
-1
1 addition, 1 deletion
Library/Homebrew/extend/os/mac/unpack_strategy/zip.rbi
with
3 additions
and
6 deletions
Library/Homebrew/extend/os/mac/unpack_strategy/zip.rb
+
2
−
5
View file @
cc0a249f
...
...
@@ -6,10 +6,9 @@ require "system_command"
module
UnpackStrategy
class
Zip
module
MacOSZipExtension
include
UnpackStrategy
include
SystemCommand
::
Mixin
private
sig
{
override
.
params
(
unpack_dir:
Pathname
,
basename:
Pathname
,
verbose:
T
::
Boolean
).
returns
(
T
.
untyped
)
}
sig
{
params
(
unpack_dir:
Pathname
,
basename:
Pathname
,
verbose:
T
::
Boolean
).
returns
(
T
.
untyped
)
}
def
extract_to_dir
(
unpack_dir
,
basename
:,
verbose
:)
with_env
(
TZ
:
"UTC"
)
do
if
merge_xattrs
&&
contains_extended_attributes?
(
path
)
...
...
@@ -58,8 +57,6 @@ module UnpackStrategy
end
end
private
sig
{
params
(
path:
Pathname
).
returns
(
T
::
Boolean
)
}
def
contains_extended_attributes?
(
path
)
path
.
zipinfo
.
grep
(
/(^__MACOSX|\._)/
).
any?
...
...
This diff is collapsed.
Click to expand it.
Library/Homebrew/extend/os/mac/unpack_strategy/zip.rbi
+
1
−
1
View file @
cc0a249f
# typed: strict
module UnpackStrategy::Zip::MacOSZipExtension
include Kernel
requires_ancestor { UnpackStrategy }
end
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment