2 files changed, 23 insertions, 21 deletions
diff --git a/Library/Homebrew/cmd/tap.rb b/Library/Homebrew/cmd/tap.rb
index fad200ce2..f69b5d092 100644
--- a/Library/Homebrew/cmd/tap.rb
+++ b/Library/Homebrew/cmd/tap.rb
@@ -108,8 +108,8 @@ module Homebrew
     end
   end
 
-  def tap_args
-    ARGV.first =~ HOMEBREW_TAP_ARGS_REGEX
+  def tap_args(tap_name=ARGV.first)
+    tap_name =~ HOMEBREW_TAP_ARGS_REGEX
     raise "Invalid tap name" unless $1 && $3
     [$1, $3]
   end
diff --git a/Library/Homebrew/cmd/untap.rb b/Library/Homebrew/cmd/untap.rb
index 7da36478b..53f8eec42 100644
--- a/Library/Homebrew/cmd/untap.rb
+++ b/Library/Homebrew/cmd/untap.rb
@@ -4,25 +4,27 @@ module Homebrew
   def untap
     raise "Usage is `brew untap <tap-name>`" if ARGV.empty?
 
-    user, repo = tap_args
-
-    # we consistently downcase in tap to ensure we are not bitten by case-insensive
-    # filesystem issues. Which is the default on mac. The problem being the
-    # filesystem cares, but our regexps don't. So unless we resolve *every* path
-    # we will get bitten.
-    user.downcase!
-    repo.downcase!
-
-    tapd = HOMEBREW_LIBRARY/"Taps/#{user}/homebrew-#{repo}"
-
-    raise "No such tap!" unless tapd.directory?
-
-    files = []
-    tapd.find_formula { |file| files << file }
-    unlink_tap_formula(files)
-    tapd.rmtree
-    tapd.dirname.rmdir_if_possible
-    puts "Untapped #{files.length} formula#{plural(files.length, 'e')}"
+    ARGV.each do |tapname|
+      user, repo = tap_args(tapname)
+
+      # we consistently downcase in tap to ensure we are not bitten by case-insensive
+      # filesystem issues. Which is the default on mac. The problem being the
+      # filesystem cares, but our regexps don't. So unless we resolve *every* path
+      # we will get bitten.
+      user.downcase!
+      repo.downcase!
+
+      tapd = HOMEBREW_LIBRARY/"Taps/#{user}/homebrew-#{repo}"
+
+      raise "No such tap!" unless tapd.directory?
+
+      files = []
+      tapd.find_formula { |file| files << file }
+      unlink_tap_formula(files)
+      tapd.rmtree
+      tapd.dirname.rmdir_if_possible
+      puts "Untapped #{files.length} formula#{plural(files.length, 'e')}"
+    end
   end
 
   def unlink_tap_formula paths