Try to remove a single .DS_Store when uninstalling

Closes Homebrew/homebrew#12976.
Closes Homebrew/homebrew#15975.

1 files changed, 6 insertions, 0 deletions

diff --git a/Library/Homebrew/extend/pathname.rb b/Library/Homebrew/extend/pathname.rb
index 0c55e6a6f..d39b21689 100644
--- 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