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

Merge pull request #6969 from dawidd6/bottle-cellar-priority

Browse Source 
bottle: prioritize HOMEBREW_CELLAR over :any over :any_skip_relocation
This commit is contained in:
Mike McQuaid 2020-02-11 12:31:09 +00:00 committed by GitHub
commit dca717e699
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Library/Homebrew/dev-cmd/bottle.rb
View File

@ -439,7 +439,27 @@ module Homebrew
raise UsageError, "--merge requires a JSON file path argument" if Homebrew.args.named.blank? raise UsageError, "--merge requires a JSON file path argument" if Homebrew.args.named.blank?
bottles_hash = Homebrew.args.named.reduce({}) do |hash, json_file| bottles_hash = Homebrew.args.named.reduce({}) do |hash, json_file|
hash.deep_merge(JSON.parse(IO.read(json_file))) hash.deep_merge(JSON.parse(IO.read(json_file))) do |key, first, second|
if key == "cellar"
# Prioritize HOMEBREW_CELLAR over :any over :any_skip_relocation
cellars = [first, second]
if cellars.include?(HOMEBREW_CELLAR)
HOMEBREW_CELLAR
elsif first.start_with?("/")
first
elsif second.start_with?("/")
second
elsif cellars.include?(:any)
:any
elsif cellars.include?(:any_skip_relocation)
:any_skip_relocation
else
second
end
else
second
end
end
end end
bottles_hash.each do |formula_name, bottle_hash| bottles_hash.each do |formula_name, bottle_hash|