diff --git a/Library/Homebrew/extend/os/mac/unpack_strategy/zip.rb b/Library/Homebrew/extend/os/mac/unpack_strategy/zip.rb index 9bbdf4a33aa9ba6aef7f2ecedbb50ef1eb384ba1..370b2a21d94fb6e9dedc77f1830ea5475436c91c 100644 --- a/Library/Homebrew/extend/os/mac/unpack_strategy/zip.rb +++ b/Library/Homebrew/extend/os/mac/unpack_strategy/zip.rb @@ -6,10 +6,9 @@ require "system_command" 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 @@ module UnpackStrategy 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 index 43597431d98881bea88c73327ca0469861c169f1..dee409eb2ddbe33a600c553376290797074cd707 100644 --- 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