Generalise the untap step so we can add to update

brew-update needs to be able to unsymlink removed stuff from taps too.

1 files changed, 15 insertions, 6 deletions

diff --git a/Library/Homebrew/cmd/untap.rb b/Library/Homebrew/cmd/untap.rb
index 892229df4..577a59a12 100644
--- a/Library/Homebrew/cmd/untap.rb
+++ b/Library/Homebrew/cmd/untap.rb
@@ -7,22 +7,31 @@ module Homebrew extend self
 
     raise "No such tap!" unless tapd.directory?
 
-    gitignores = (HOMEBREW_LIBRARY/"Formula/.gitignore").read.split rescue []
+    files = []
+    tapd.find_formula{ |file| files << Pathname.new("#{user}-#{repo}").join(file) }
+    untapped = unlink_tap_formula(files)
+    rm_rf tapd
+    puts "Untapped #{untapped} formula"
+  end
+
+  def unlink_tap_formula formulae
     untapped = 0
+    gitignores = (HOMEBREW_LIBRARY/"Formula/.gitignore").read.split rescue []
 
-    tapd.find_formula do |pn|
-      bn = pn.basename.to_s
+    formulae.each do |formula|
+      tapd = (HOMEBREW_LIBRARY/"Taps/#{formula}").dirname
+      bn = formula.basename.to_s
       pn = HOMEBREW_LIBRARY/"Formula/#{bn}"
-      if pn.symlink? and pn.realpath.to_s =~ %r[^#{tapd.realpath}]
+
+      if pn.symlink? and pn.realpath.to_s =~ %r[^#{tapd}]
         pn.delete
         gitignores.delete(bn)
         untapped += 1
       end
     end
-    rm_rf tapd
 
     HOMEBREW_REPOSITORY.join("Library/Formula/.gitignore").atomic_write(gitignores * "\n")
 
-    puts "Untapped #{untapped} formula"
+    untapped
   end
 end