Merge pull request #2106 from naoty/exclude-executable-metafiles

Exclude executables from metafiles

4 files changed, 17 insertions, 2 deletions

diff --git a/Library/Homebrew/extend/pathname.rb b/Library/Homebrew/extend/pathname.rb
index 9f6861a9a..eb254c624 100644
--- a/Library/Homebrew/extend/pathname.rb
+++ b/Library/Homebrew/extend/pathname.rb
@@ -457,6 +457,10 @@ class Pathname
     end
   end
 
+  def ds_store?
+    basename.to_s == ".DS_Store"
+  end
+
   # https://bugs.ruby-lang.org/issues/9915
   if RUBY_VERSION == "2.0.0"
     prepend Module.new {
diff --git a/Library/Homebrew/keg.rb b/Library/Homebrew/keg.rb
index 94e3ff55b..9ebfc3bc3 100644
--- a/Library/Homebrew/keg.rb
+++ b/Library/Homebrew/keg.rb
@@ -207,8 +207,8 @@ class Keg
   alias eql? ==
 
   def empty_installation?
-    Pathname.glob("#{path}/**/*") do |file|
-      next if file.directory?
+    Pathname.glob("#{path}/*") do |file|
+      return false if file.directory? && !file.children.reject(&:ds_store?).empty?
       basename = file.basename.to_s
       next if Metafiles.copy?(basename)
       next if %w[.DS_Store INSTALL_RECEIPT.json].include?(basename)
diff --git a/Library/Homebrew/test/keg_spec.rb b/Library/Homebrew/test/keg_spec.rb
index f40002dd2..3bf1257e6 100644
--- a/Library/Homebrew/test/keg_spec.rb
+++ b/Library/Homebrew/test/keg_spec.rb
@@ -60,6 +60,10 @@ describe Keg do
 
     (keg/"bin").rmtree
     expect(keg).to be_an_empty_installation
+
+    (keg/"bin").mkpath
+    touch keg.join("bin", "todo")
+    expect(keg).not_to be_an_empty_installation
   end
 
   specify "#oldname_opt_record" do
diff --git a/Library/Homebrew/test/pathname_spec.rb b/Library/Homebrew/test/pathname_spec.rb
index 6e7dc34aa..21e14479f 100644
--- a/Library/Homebrew/test/pathname_spec.rb
+++ b/Library/Homebrew/test/pathname_spec.rb
@@ -284,6 +284,13 @@ describe Pathname do
       expect(dst/dir.basename).to be_a_directory
     end
   end
+
+  describe "#ds_store?" do
+    it "returns whether a file is .DS_Store or not" do
+      expect(file).not_to be_ds_store
+      expect(file/".DS_Store").to be_ds_store
+    end
+  end
 end
 
 describe FileUtils do