admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Merge pull request #13688 from Rylan12/fix-bump-cask-pr

Browse Source 
`bump-cask-pr`: fix `sha256` replacement with `arch`
This commit is contained in:
Rylan Polster 2022-08-12 10:04:50 -04:00 committed by GitHub
commit e30b2a173c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Library/Homebrew/dev-cmd/bump-cask-pr.rb
View File

@ -138,8 +138,10 @@ module Homebrew
replacement_pairs << fetch_cask(tmp_contents, config: lang_config) replacement_pairs << fetch_cask(tmp_contents, config: lang_config)
end end
# TODO: Use SimulateSystem once all casks use on_system blocks
if tmp_contents.include?("Hardware::CPU.intel?") if tmp_contents.include?("Hardware::CPU.intel?")
other_intel = !Hardware::CPU.intel? other_intel = !Hardware::CPU.intel?
Homebrew::SimulateSystem.arch = other_intel ? :intel : :arm
other_contents = tmp_contents.gsub("Hardware::CPU.intel?", other_intel.to_s) other_contents = tmp_contents.gsub("Hardware::CPU.intel?", other_intel.to_s)
other_cask = Cask::CaskLoader.load(other_contents) other_cask = Cask::CaskLoader.load(other_contents)
@ -151,6 +153,8 @@ module Homebrew
lang_config = other_cask.config.merge(Cask::Config.new(explicit: { languages: [language] })) lang_config = other_cask.config.merge(Cask::Config.new(explicit: { languages: [language] }))
replacement_pairs << fetch_cask(other_contents, config: lang_config) replacement_pairs << fetch_cask(other_contents, config: lang_config)
end end
Homebrew::SimulateSystem.clear
end end
end end
end end