diff options
| author | Josh Hagins | 2016-10-19 11:56:40 -0400 |
|---|---|---|
| committer | Josh Hagins | 2016-10-23 21:48:11 -0400 |
| commit | c7e6613f7b3144c9ee45d140978e713a89977d6d (patch) | |
| tree | bd4ff0164a6563e193f37b375184388bc3805478 | |
| parent | 44f1354d63d8c95a61bb12353838c03e9abbebb6 (diff) | |
| download | brew-c7e6613f7b3144c9ee45d140978e713a89977d6d.tar.bz2 | |
tap_constants: rename HOMEBREW_CASK_TAP_FORMULA_REGEX
New name is HOMEBREW_CASK_TAP_CASK_REGEX
| -rw-r--r-- | Library/Homebrew/cmd/install.rb | 2 | ||||
| -rw-r--r-- | Library/Homebrew/extend/ARGV.rb | 2 | ||||
| -rw-r--r-- | Library/Homebrew/tap_constants.rb | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/Library/Homebrew/cmd/install.rb b/Library/Homebrew/cmd/install.rb index 2c027a52e..0867e893a 100644 --- a/Library/Homebrew/cmd/install.rb +++ b/Library/Homebrew/cmd/install.rb @@ -76,7 +76,7 @@ module Homebrew unless ARGV.force? ARGV.named.each do |name| next if File.exist?(name) - if name !~ HOMEBREW_TAP_FORMULA_REGEX && name !~ HOMEBREW_CASK_TAP_FORMULA_REGEX + if name !~ HOMEBREW_TAP_FORMULA_REGEX && name !~ HOMEBREW_CASK_TAP_CASK_REGEX next end tap = Tap.fetch($1, $2) diff --git a/Library/Homebrew/extend/ARGV.rb b/Library/Homebrew/extend/ARGV.rb index f2f959f22..0adf8d548 100644 --- a/Library/Homebrew/extend/ARGV.rb +++ b/Library/Homebrew/extend/ARGV.rb @@ -58,7 +58,7 @@ module HomebrewArgvExtension end def casks - @casks ||= downcased_unique_named.grep HOMEBREW_CASK_TAP_FORMULA_REGEX + @casks ||= downcased_unique_named.grep HOMEBREW_CASK_TAP_CASK_REGEX end def kegs diff --git a/Library/Homebrew/tap_constants.rb b/Library/Homebrew/tap_constants.rb index 671081370..4ef8015c2 100644 --- a/Library/Homebrew/tap_constants.rb +++ b/Library/Homebrew/tap_constants.rb @@ -7,4 +7,4 @@ HOMEBREW_TAP_DIR_REGEX = %r{#{Regexp.escape(HOMEBREW_LIBRARY.to_s)}/Taps/([\w-]+ # match taps' formula paths, e.g. HOMEBREW_LIBRARY/Taps/someuser/sometap/someformula HOMEBREW_TAP_PATH_REGEX = Regexp.new(HOMEBREW_TAP_DIR_REGEX.source + %r{/(.*)}.source) # match the default and the versions brew-cask tap e.g. Caskroom/cask or Caskroom/versions -HOMEBREW_CASK_TAP_FORMULA_REGEX = %r{^([Cc]askroom)/(cask|versions)/([\w+-.]+)$} +HOMEBREW_CASK_TAP_CASK_REGEX = %r{^([Cc]askroom)/(cask|versions)/([\w+-.]+)$} |