Merge pull request #19526 from botantony/dmg-unpack

unpack `.dmg`: ignore `.HFS+ Private*` metadata directories
2025-03-18 12:10:19 +00:00 · 2025-03-18 12:10:19 +00:00 · 3e5f7b95a5
commit 3e5f7b95a5
parent 3f6d30f885 d3cfc3d193
2 changed files with 14 additions and 12 deletions
--- a/Library/Homebrew/test/support/fixtures/test.dmg.gz
+++ b/Library/Homebrew/test/support/fixtures/test.dmg.gz
--- a/Library/Homebrew/unpack_strategy/dmg.rb
+++ b/Library/Homebrew/unpack_strategy/dmg.rb
@ -14,18 +14,20 @@ module UnpackStrategy
    module Bom
      extend SystemCommand::Mixin

-      DMG_METADATA = T.let(Set.new(%w[
-        .background
-        .com.apple.timemachine.donotpresent
-        .com.apple.timemachine.supported
-        .DocumentRevisions-V100
-        .DS_Store
-        .fseventsd
-        .MobileBackups
-        .Spotlight-V100
-        .TemporaryItems
-        .Trashes
-        .VolumeIcon.icns
+      DMG_METADATA = T.let(Set.new([
+        ".background",
+        ".com.apple.timemachine.donotpresent",
+        ".com.apple.timemachine.supported",
+        ".DocumentRevisions-V100",
+        ".DS_Store",
+        ".fseventsd",
+        ".MobileBackups",
+        ".Spotlight-V100",
+        ".TemporaryItems",
+        ".Trashes",
+        ".VolumeIcon.icns",
+        ".HFS+ Private Directory Data\r", # do not remove `\r`, it is a part of directory name
+        ".HFS+ Private Data\r",
      ]).freeze, T::Set[String])
      private_constant :DMG_METADATA