From 835466ecd8ce3b30f240e8dbc429201cf6001cb5 Mon Sep 17 00:00:00 2001 From: Michael Cho Date: Wed, 16 Oct 2024 12:53:08 -0400 Subject: [PATCH] unpack_strategy: use `Mktemp` instead of `Dir.mktmpdir` --- Library/Homebrew/unpack_strategy.rb | 26 +++----------------------- 1 file changed, 3 insertions(+), 23 deletions(-) diff --git a/Library/Homebrew/unpack_strategy.rb b/Library/Homebrew/unpack_strategy.rb index 8f102c7509a2d..5faede3948356 100644 --- a/Library/Homebrew/unpack_strategy.rb +++ b/Library/Homebrew/unpack_strategy.rb @@ -1,6 +1,7 @@ # typed: strict # frozen_string_literal: true +require "mktemp" require "system_command" # Module containing all available strategies for unpacking archives. @@ -157,29 +158,8 @@ def extract(to: nil, basename: nil, verbose: false) ).returns(T.untyped) } def extract_nestedly(to: nil, basename: nil, verbose: false, prioritize_extension: false) - Dir.mktmpdir("homebrew-unpack", HOMEBREW_TEMP) do |tmp_unpack_dir| - tmp_unpack_dir = Pathname(tmp_unpack_dir) - - # Make sure files inside the temporary directory have the same group as the brew instance. - # - # @see https://github.com/Homebrew/brew/blob/4.4.0/Library/Homebrew/mktemp.rb#L57-L72 - group_id = if HOMEBREW_BREW_FILE.grpowned? - HOMEBREW_BREW_FILE.stat.gid - else - Process.gid - end - begin - tmp_unpack_dir.chown(nil, group_id) - rescue Errno::EPERM - require "etc" - group_name = begin - Etc.getgrgid(group_id)&.name - rescue ArgumentError - # Cover for misconfigured NSS setups - nil - end - opoo "Failed setting group \"#{group_name || group_id}\" on #{tmp_unpack_dir}" - end + Mktemp.new("homebrew-unpack").run(chdir: false) do |unpack_dir| + tmp_unpack_dir = T.must(unpack_dir.tmpdir) extract(to: tmp_unpack_dir, basename:, verbose:)