exclude __MACOSX dir when unzipping

should take care of Homebrew#222
zhon · Apr 28, 2013 · 0de91ed · 0de91ed
1 parent 2b7b530
commit 0de91ed
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 2 deletions.
diff --git a/lib/cask/installer.rb b/lib/cask/installer.rb
@@ -19,7 +19,7 @@ def install(cask)
       ohai "Success! #{cask} installed to #{cask.destination_path}"
 
       unless cask.caveats.empty?
-        ohai 'Caveats', cask.caveats
+        ohai 'Caveats', cask.caveats 
       end
     end
 
@@ -63,7 +63,7 @@ def _with_extracted_mountpoints(path)
       elsif _zip?(path)
         destdir = "/tmp/brewcask_#{@title}_extracted"
         `mkdir -p '#{destdir}'`
-        `unzip -d '#{destdir}' '#{path}'`
+        `unzip -d '#{destdir}' '#{path}' -x '__MACOSX/*'`
         begin
           yield destdir
         ensure

diff --git a/test/cask/installer_test.rb b/test/cask/installer_test.rb
@@ -61,6 +61,14 @@
       }, /Here are some things you might want to know/)
       with_caveats.must_be :installed?
     end
+
+    it "does not extract __MACOSX directories from zips" do
+      with_macosx_dir = Cask.load('with-macosx-dir')
+      shutup do
+        Cask::Installer.install(with_macosx_dir)
+      end
+      with_macosx_dir.destination_path.join('__MACOSX').wont_be :directory?
+    end
   end
 
   describe "uninstall" do

diff --git a/test/support/Casks/with-macosx-dir.rb b/test/support/Casks/with-macosx-dir.rb
@@ -0,0 +1,6 @@
+class WithMacosxDir < TestCask
+  url TestHelper.local_binary('MyFancyApp.zip')
+  homepage 'http://example.com/MyFancyApp'
+  version '1.2.3'
+  sha1 'b0475c34136c8e00ceb4b95c245291d53d5deab3'
+end
diff --git a/test/support/binaries/MyFancyApp.zip b/test/support/binaries/MyFancyApp.zip