Merge pull request #16288 from Bo98/macos-zip-fix

unpack_strategy/zip: fix super ancestor on macOS without Sorbet Runtime
Homebrew · Dec 4, 2023 · 4889e10 · 4889e10
2 parents 8fbe927 + cc0a249
commit 4889e10
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/Library/Homebrew/extend/os/mac/unpack_strategy/zip.rb b/Library/Homebrew/extend/os/mac/unpack_strategy/zip.rb
@@ -6,10 +6,9 @@
 module UnpackStrategy
   class Zip
     module MacOSZipExtension
-      include UnpackStrategy
-      include SystemCommand::Mixin
+      private
 
-      sig { override.params(unpack_dir: Pathname, basename: Pathname, verbose: T::Boolean).returns(T.untyped) }
+      sig { params(unpack_dir: Pathname, basename: Pathname, verbose: T::Boolean).returns(T.untyped) }
       def extract_to_dir(unpack_dir, basename:, verbose:)
         with_env(TZ: "UTC") do
           if merge_xattrs && contains_extended_attributes?(path)
@@ -58,8 +57,6 @@ def extract_to_dir(unpack_dir, basename:, verbose:)
         end
       end
 
-      private
-
       sig { params(path: Pathname).returns(T::Boolean) }
       def contains_extended_attributes?(path)
         path.zipinfo.grep(/(^__MACOSX|\._)/).any?

diff --git a/Library/Homebrew/extend/os/mac/unpack_strategy/zip.rbi b/Library/Homebrew/extend/os/mac/unpack_strategy/zip.rbi
@@ -1,5 +1,5 @@
 # typed: strict
 
 module UnpackStrategy::Zip::MacOSZipExtension
-  include Kernel
+  requires_ancestor { UnpackStrategy }
 end