diff options
| author | Xu Cheng | 2015-12-07 00:04:40 +0800 |
|---|---|---|
| committer | Xu Cheng | 2015-12-09 16:56:59 +0800 |
| commit | 6e92609cf42c18a84c0eefd3e7dea56856330f76 (patch) | |
| tree | a79454b0c44d5392bd8ebda2b514edb75f82492e | |
| parent | 061a34b138232083fdad7eaf28a30085adccbf42 (diff) | |
| download | brew-6e92609cf42c18a84c0eefd3e7dea56856330f76.tar.bz2 | |
Formulary: use same logic to handle core fully-qualified name
| -rw-r--r-- | Library/Homebrew/cmd/install.rb | 4 | ||||
| -rw-r--r-- | Library/Homebrew/formulary.rb | 8 | ||||
| -rw-r--r-- | Library/Homebrew/tap_constants.rb | 2 |
3 files changed, 2 insertions, 12 deletions
diff --git a/Library/Homebrew/cmd/install.rb b/Library/Homebrew/cmd/install.rb index 7afa3462d..41cefb833 100644 --- a/Library/Homebrew/cmd/install.rb +++ b/Library/Homebrew/cmd/install.rb @@ -14,8 +14,8 @@ module Homebrew end ARGV.named.each do |name| - if !File.exist?(name) && (name !~ HOMEBREW_CORE_FORMULA_REGEX) \ - && (name =~ HOMEBREW_TAP_FORMULA_REGEX || name =~ HOMEBREW_CASK_TAP_FORMULA_REGEX) + if !File.exist?(name) && + (name =~ HOMEBREW_TAP_FORMULA_REGEX || name =~ HOMEBREW_CASK_TAP_FORMULA_REGEX) tap = Tap.fetch($1, $2) tap.install unless tap.installed? end diff --git a/Library/Homebrew/formulary.rb b/Library/Homebrew/formulary.rb index d7b9f020b..4678f7a0e 100644 --- a/Library/Homebrew/formulary.rb +++ b/Library/Homebrew/formulary.rb @@ -262,14 +262,6 @@ class Formulary return FromUrlLoader.new(ref) when Pathname::BOTTLE_EXTNAME_RX return BottleLoader.new(ref) - when HOMEBREW_CORE_FORMULA_REGEX - name = $1 - formula_with_that_name = core_path(name) - if (newname = FORMULA_RENAMES[name]) && !formula_with_that_name.file? - return FormulaLoader.new(newname, core_path(newname)) - else - return FormulaLoader.new(name, formula_with_that_name) - end when HOMEBREW_TAP_FORMULA_REGEX return TapLoader.new(ref) end diff --git a/Library/Homebrew/tap_constants.rb b/Library/Homebrew/tap_constants.rb index ce470bd4b..ef8077d1b 100644 --- a/Library/Homebrew/tap_constants.rb +++ b/Library/Homebrew/tap_constants.rb @@ -1,7 +1,5 @@ # match taps' formulae, e.g. someuser/sometap/someformula HOMEBREW_TAP_FORMULA_REGEX = %r{^([\w-]+)/([\w-]+)/([\w+-.]+)$} -# match core's formulae, e.g. homebrew/homebrew/someformula -HOMEBREW_CORE_FORMULA_REGEX = %r{^homebrew/homebrew/([\w+-.]+)$}i # match taps' directory paths, e.g. HOMEBREW_LIBRARY/Taps/someuser/sometap HOMEBREW_TAP_DIR_REGEX = %r{#{Regexp.escape(HOMEBREW_LIBRARY.to_s)}/Taps/([\w-]+)/([\w-]+)} # match taps' formula paths, e.g. HOMEBREW_LIBRARY/Taps/someuser/sometap/someformula |