Skip to content

Commit

Permalink
unpack_strategy: fix unpack Dir.mktmpdir group
Browse files Browse the repository at this point in the history
Otherwise the files will be unpacked with group wheel on macOS which
gets copied over when running `cp -al`.
  • Loading branch information
cho-m committed Oct 13, 2024
1 parent 3ba4b8d commit f223fef
Showing 1 changed file with 21 additions and 0 deletions.
21 changes: 21 additions & 0 deletions Library/Homebrew/unpack_strategy.rb
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,27 @@ def extract_nestedly(to: nil, basename: nil, verbose: false, prioritize_extensio
Dir.mktmpdir("homebrew-unpack", HOMEBREW_TEMP) do |tmp_unpack_dir|
tmp_unpack_dir = Pathname(tmp_unpack_dir)

# Make sure files inside the temporary directory have the same group as the brew instance.
#
# @see https://github.com/Homebrew/brew/blob/4.4.0/Library/Homebrew/mktemp.rb#L57-L72
group_id = if HOMEBREW_BREW_FILE.grpowned?
HOMEBREW_BREW_FILE.stat.gid
else
Process.gid
end
begin
tmp_unpack_dir.chown(nil, group_id)
rescue Errno::EPERM
require "etc"

Check warning on line 174 in Library/Homebrew/unpack_strategy.rb

View check run for this annotation

Codecov / codecov/patch

Library/Homebrew/unpack_strategy.rb#L174

Added line #L174 was not covered by tests
group_name = begin
Etc.getgrgid(group_id)&.name
rescue ArgumentError
# Cover for misconfigured NSS setups
nil

Check warning on line 179 in Library/Homebrew/unpack_strategy.rb

View check run for this annotation

Codecov / codecov/patch

Library/Homebrew/unpack_strategy.rb#L179

Added line #L179 was not covered by tests
end
opoo "Failed setting group \"#{group_name || group_id}\" on #{tmp_unpack_dir}"

Check warning on line 181 in Library/Homebrew/unpack_strategy.rb

View check run for this annotation

Codecov / codecov/patch

Library/Homebrew/unpack_strategy.rb#L181

Added line #L181 was not covered by tests
end

extract(to: tmp_unpack_dir, basename:, verbose:)

children = tmp_unpack_dir.children
Expand Down

0 comments on commit f223fef

Please sign in to comment.