Search by substring unless term is inside /../

2 files changed, 6 insertions, 2 deletions

diff --git a/Library/Homebrew/ARGV+yeast.rb b/Library/Homebrew/ARGV+yeast.rb
index 63d983c9e..53661d068 100644
--- a/Library/Homebrew/ARGV+yeast.rb
+++ b/Library/Homebrew/ARGV+yeast.rb
@@ -88,7 +88,7 @@ Usage: brew [--verbose|-v]
 Commands:
   install formula ... [--debug|-d] [--interactive|-i] [--ignore-dependencies]
   remove formula ...
-  search [regex]
+  search [/regex/] [substring]
   list [--brewed] [--unbrewed] [formula] ...
   link formula ...
   unlink formula ...
diff --git a/bin/brew b/bin/brew
index 24939a019..b3a1a3c82 100755
--- a/bin/brew
+++ b/bin/brew
@@ -52,7 +52,11 @@ begin
 
     when 'search', '-S'
       formulae = (HOMEBREW_PREFIX+'Library'+'Formula').children.sort.map{|f| f.basename('.rb') }
-      puts_columns formulae.grep(Regexp.new(ARGV.first || ''))
+      if ARGV.first =~ /^\/(.*)\/$/
+        puts_columns formulae.grep(Regexp.new($1))
+      else
+        puts_columns formulae.grep(/.*#{ARGV.first}.*/)
+      end
 
     when 'edit'
       if ARGV.named_empty?