Skip to content
Snippets Groups Projects
Commit 8f0249e9 authored by Xu Cheng's avatar Xu Cheng
Browse files

handle mxcl/master synonym inside Tab#from_file_content

parent 8faaba66
No related branches found
No related tags found
No related merge requests found
......@@ -48,7 +48,7 @@ def bottle_resolve_formula_names bottle_file
name = receipt_file_path.split("/").first
tap = Tab.from_file_content(receipt_file, "#{bottle_file}/#{receipt_file_path}").tap
if tap.nil? || tap == "Homebrew/homebrew" || tap == "mxcl/master"
if tap.nil? || tap == "Homebrew/homebrew"
full_name = name
else
full_name = "#{tap.sub("homebrew-", "")}/#{name}"
......@@ -67,7 +67,7 @@ class Bintray
end
def self.repository(tap=nil)
return "bottles" if tap.nil? || tap == "Homebrew/homebrew" || tap == "mxcl/master"
return "bottles" if tap.nil? || tap == "Homebrew/homebrew"
"bottles-#{tap.sub(/^homebrew\/(homebrew-)?/i, "")}"
end
end
......
......@@ -186,7 +186,7 @@ class Formulary
tap = tab.tap
spec ||= tab.spec
if tap.nil? || tap == "Homebrew/homebrew" || tap == "mxcl/master"
if tap.nil? || tap == "Homebrew/homebrew"
factory(rack.basename.to_s, spec)
else
factory("#{tap.sub("homebrew-", "")}/#{rack.basename}", spec)
......
......@@ -43,6 +43,10 @@ class Tab < OpenStruct
tapped_from = attributes["tapped_from"]
unless tapped_from.nil? || tapped_from == "path or URL"
attributes["source"]["tap"] = attributes.delete("tapped_from")
if attributes["source"]["tap"] == "mxcl/master"
attributes["source"]["tap"] == "Homebrew/homebrew"
end
end
if attributes["source"]["spec"].nil?
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment