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

support alias for tap

Browse Source
This commit is contained in:
Xu Cheng 2015-09-12 18:04:06 +08:00
parent 3bc2ff8e20
commit 5f68fff92b
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Library/Homebrew/formulary.rb
View File

@ -148,7 +148,15 @@ class Formulary
@tap = Tap.new user, repo.sub(/^homebrew-/, "") @tap = Tap.new user, repo.sub(/^homebrew-/, "")
name = @tap.formula_renames.fetch(name, name) name = @tap.formula_renames.fetch(name, name)
path = @tap.formula_files.detect { |file| file.basename(".rb").to_s == name } path = @tap.formula_files.detect { |file| file.basename(".rb").to_s == name }
path ||= @tap.path/"#{name}.rb"
unless path
if (possible_alias = @tap.path/"Aliases/#{name}").file?
path = possible_alias.resolved_path
name = path.basename(".rb").to_s
else
path = @tap.path/"#{name}.rb"
end
end
super name, path super name, path
end end
@ -279,7 +287,9 @@ class Formulary
if possible_tap_formulae.size > 1 if possible_tap_formulae.size > 1
raise TapFormulaAmbiguityError.new(ref, possible_tap_formulae) raise TapFormulaAmbiguityError.new(ref, possible_tap_formulae)
elsif possible_tap_formulae.size == 1 elsif possible_tap_formulae.size == 1
return FormulaLoader.new(ref, possible_tap_formulae.first) path = possible_tap_formulae.first.resolved_path
name = path.basename(".rb").to_s
return FormulaLoader.new(name, path)
end end
if newref = FORMULA_RENAMES[ref] if newref = FORMULA_RENAMES[ref]
@ -320,7 +330,8 @@ class Formulary
Pathname.glob([ Pathname.glob([
"#{tap}Formula/#{name}.rb", "#{tap}Formula/#{name}.rb",
"#{tap}HomebrewFormula/#{name}.rb", "#{tap}HomebrewFormula/#{name}.rb",
"#{tap}#{name}.rb" "#{tap}#{name}.rb",
"#{tap}Aliases/#{name}",
]).detect(&:file?) ]).detect(&:file?)
end.compact end.compact
end end