Skip to content
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

Jump to bottom

unpack_strategy/zip: allow unzip formula to be used #12947

Merged
merged 1 commit into from
Mar 2, 2022
Merged

unpack_strategy/zip: allow unzip formula to be used #12947

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 7 additions & 0 deletions Library/Homebrew/unpack_strategy/zip.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,17 @@ def self.can_extract?(path)
.returns(SystemCommand::Result)
}
def extract_to_dir(unpack_dir, basename:, verbose:)
unzip = begin
Formula["unzip"]
rescue FormulaUnavailableError
nil
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What happens if there's no system unzip and this is nil?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

PATH.new ignores nil so it'll just use ENV["PATH"].

Copy link
Member Author

@Bo98 Bo98 Mar 2, 2022 •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh misread your question. The command will fail to execute if there's no system unzip and this is nil (as it did before - so no change here). But this really should only be nil if homebrew-core is not installed, and I imagine there are many other issues in that case. All the other unpack strategies will actually error since they don't have a FormulaUnavailableError check (we do here because it's needed for the rspec tests).

If there's a different way we want to handle this, I think it should be done in a change applying to all unpack strategies, for consistency.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Gotcha, that all seems fine to me then 👍🏻

end

with_env(TZ: "UTC") do
quiet_flags = verbose ? [] : ["-qq"]
result = system_command! "unzip",
args: [*quiet_flags, "-o", path, "-d", unpack_dir],
env: { "PATH" => PATH.new(unzip&.opt_bin, ENV["PATH"]) },
carlocab marked this conversation as resolved.
Show resolved Hide resolved
verbose: verbose,
print_stderr: false

Expand Down