Try to remove a single .DS_Store when uninstalling

Closes Homebrew/homebrew#12976. Closes Homebrew/homebrew#15975.
2012-11-11 11:39:09 -08:00 · 2012-11-11 11:39:09 -08:00 · aecd342a2b
commit aecd342a2b
parent 14cb8c8fce
1 changed files with 6 additions and 0 deletions
--- a/Library/Homebrew/extend/pathname.rb
+++ b/Library/Homebrew/extend/pathname.rb
@ -145,6 +145,12 @@ class Pathname
    rmdir
    true
  rescue SystemCallError => e
+    # OK, maybe there was only a single `.DS_Store` file in that folder
+    if (self/'.DS_Store').exist? && self.children.length == 1
+      (self/'.DS_Store').unlink
+      retry
+    end
+
    raise unless e.errno == Errno::ENOTEMPTY::Errno or e.errno == Errno::EACCES::Errno or e.errno == Errno::ENOENT::Errno
    false
  end