From 9bd216725798148a28c0c6fa5422ad12148db799 Mon Sep 17 00:00:00 2001 From: Markus Reiter Date: Sat, 21 Jul 2018 16:57:41 +0200 Subject: [PATCH] Add quiet flags if not verbose. --- Library/Homebrew/unpack_strategy.rb | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/Library/Homebrew/unpack_strategy.rb b/Library/Homebrew/unpack_strategy.rb index 4ae1472d11..e830091b43 100644 --- a/Library/Homebrew/unpack_strategy.rb +++ b/Library/Homebrew/unpack_strategy.rb @@ -164,7 +164,8 @@ class ZipUnpackStrategy < UnpackStrategy private def extract_to_dir(unpack_dir, basename:, verbose:) - safe_system "unzip", "-qq", path, "-d", unpack_dir + quiet_flags = verbose ? [] : ["-qq"] + safe_system "unzip", *quiet_flags, path, "-d", unpack_dir end end @@ -200,7 +201,8 @@ class XzUnpackStrategy < UnpackStrategy def extract_to_dir(unpack_dir, basename:, verbose:) FileUtils.cp path, unpack_dir/basename, preserve: true - safe_system Formula["xz"].opt_bin/"unxz", "-q", "-T0", unpack_dir/basename + quiet_flags = verbose ? [] : ["-q"] + safe_system Formula["xz"].opt_bin/"unxz", *quiet_flags, "-T0", unpack_dir/basename extract_nested_tar(unpack_dir) end @@ -226,7 +228,8 @@ class Bzip2UnpackStrategy < UnpackStrategy def extract_to_dir(unpack_dir, basename:, verbose:) FileUtils.cp path, unpack_dir/basename, preserve: true - safe_system "bunzip2", "-q", unpack_dir/basename + quiet_flags = verbose ? [] : ["-q"] + safe_system "bunzip2", *quiet_flags, unpack_dir/basename end end @@ -239,7 +242,8 @@ class GzipUnpackStrategy < UnpackStrategy def extract_to_dir(unpack_dir, basename:, verbose:) FileUtils.cp path, unpack_dir/basename, preserve: true - safe_system "gunzip", "-q", "-N", unpack_dir/basename + quiet_flags = verbose ? [] : ["-q"] + safe_system "gunzip", *quiet_flags, "-N", unpack_dir/basename end end @@ -252,7 +256,8 @@ class LzipUnpackStrategy < UnpackStrategy def extract_to_dir(unpack_dir, basename:, verbose:) FileUtils.cp path, unpack_dir/basename, preserve: true - safe_system Formula["lzip"].opt_bin/"lzip", "-d", "-q", unpack_dir/basename + quiet_flags = verbose ? [] : ["-q"] + safe_system Formula["lzip"].opt_bin/"lzip", "-d", *quiet_flags, unpack_dir/basename end end