From 32e42e064d678b97c8676dd2cbb3e22f305c5789 Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Mon, 21 Oct 2013 04:24:54 +0100 Subject: global: unify tap regex. Signed-off-by: Mike McQuaid --- Library/Homebrew/cmd/search.rb | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'Library/Homebrew/cmd') diff --git a/Library/Homebrew/cmd/search.rb b/Library/Homebrew/cmd/search.rb index b2febbdba..204a178ae 100644 --- a/Library/Homebrew/cmd/search.rb +++ b/Library/Homebrew/cmd/search.rb @@ -4,12 +4,6 @@ require 'utils' require 'utils/json' module Homebrew extend self - - # A regular expession to capture the username (one or more char but no `/`, - # which has to be escaped like `\/`), repository, followed by an optional `/` - # and an optional query. - TAP_QUERY_REGEX = /^([^\/]+)\/([^\/]+)\/?(.+)?$/ - def search if ARGV.include? '--macports' exec_browser "http://www.macports.org/ports.php?by=name&substr=#{ARGV.next}" @@ -25,7 +19,7 @@ module Homebrew extend self exec_browser "http://packages.ubuntu.com/search?keywords=#{ARGV.next}&searchon=names&suite=all§ion=all" elsif (query = ARGV.first).nil? puts_columns Formula.names - elsif ARGV.first =~ TAP_QUERY_REGEX + elsif ARGV.first =~ HOMEBREW_TAP_REGEX # So look for user/repo/query or list all formulae by the tap # we downcase to avoid case-insensitive filesystem issues. user, repo, query = $1.downcase, $2.downcase, $3 -- cgit v1.2.3