Modified tap regex to support formulas with a +-sign, e.g. gtk+.rb

Fixes Homebrew/homebrew#30204.
Closes Homebrew/homebrew#30217.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
This commit is contained in:
Marc Sowen 2014-06-17 09:14:03 +02:00 committed by Jack Nagel
parent 53afdae10e
commit ce78b11710

View File

@ -1,7 +1,7 @@
# match expressions when taps are given as ARGS, e.g. someuser/sometap # match expressions when taps are given as ARGS, e.g. someuser/sometap
HOMEBREW_TAP_ARGS_REGEX = %r{^([\w-]+)/(homebrew-)?([\w-]+)$} HOMEBREW_TAP_ARGS_REGEX = %r{^([\w-]+)/(homebrew-)?([\w-]+)$}
# match taps' formula, e.g. someuser/sometap/someformula # match taps' formula, e.g. someuser/sometap/someformula
HOMEBREW_TAP_FORMULA_REGEX = %r{^([\w-]+)/([\w-]+)/([\w-]+)$} HOMEBREW_TAP_FORMULA_REGEX = %r{^([\w-]+)/([\w-]+)/([\w+-]+)$}
# match taps' directory path, e.g. HOMEBREW_LIBRARY/Taps/someuser/sometap # match taps' directory path, e.g. HOMEBREW_LIBRARY/Taps/someuser/sometap
HOMEBREW_TAP_DIR_REGEX = %r{#{HOMEBREW_LIBRARY}/Taps/([\w-]+)/([\w-]+)} HOMEBREW_TAP_DIR_REGEX = %r{#{HOMEBREW_LIBRARY}/Taps/([\w-]+)/([\w-]+)}
# match taps' formula path, e.g. HOMEBREW_LIBRARY/Taps/someuser/sometap/someformula # match taps' formula path, e.g. HOMEBREW_LIBRARY/Taps/someuser/sometap/someformula