admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Allow printing command output when HOMEBREW_DEBUG/--debug is set.

Browse Source
This commit is contained in:
Markus Reiter 2023-10-10 02:08:27 +02:00
parent 16aa6372a3
commit 5d87da135a
No known key found for this signature in database
GPG Key ID: 245293B51702655B
1 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
Library/Homebrew/system_command.rb
View File

@ -47,10 +47,20 @@ class SystemCommand
each_output_line do |type, line| each_output_line do |type, line|
case type case type
when :stdout when :stdout
$stdout << redact_secrets(line, @secrets) if print_stdout? case @print_stdout
when true
$stdout << redact_secrets(line, @secrets)
when :debug
$stderr << redact_secrets(line, @secrets) if debug?
end
@output << [:stdout, line] @output << [:stdout, line]
when :stderr when :stderr
$stderr << redact_secrets(line, @secrets) if print_stderr? case @print_stderr
when true
$stderr << redact_secrets(line, @secrets)
when :debug
$stderr << redact_secrets(line, @secrets) if debug?
end
@output << [:stderr, line] @output << [:stderr, line]
end end
end end
@ -69,8 +79,8 @@ class SystemCommand
env: T::Hash[String, String], env: T::Hash[String, String],
input: T.any(String, T::Array[String]), input: T.any(String, T::Array[String]),
must_succeed: T::Boolean, must_succeed: T::Boolean,
print_stdout: T::Boolean, print_stdout: T.any(T::Boolean, Symbol),
print_stderr: T::Boolean, print_stderr: T.any(T::Boolean, Symbol),
debug: T.nilable(T::Boolean), debug: T.nilable(T::Boolean),
verbose: T.nilable(T::Boolean), verbose: T.nilable(T::Boolean),
secrets: T.any(String, T::Array[String]), secrets: T.any(String, T::Array[String]),
@ -98,7 +108,14 @@ class SystemCommand
@executable = executable @executable = executable
@args = args @args = args
raise ArgumentError, "sudo_as_root cannot be set if sudo is false" if !sudo && sudo_as_root raise ArgumentError, "`sudo_as_root` cannot be set if sudo is false" if !sudo && sudo_as_root
if print_stdout.is_a?(Symbol) && print_stdout != :debug
raise ArgumentError, "`print_stdout` is not a valid symbol"
end
if print_stderr.is_a?(Symbol) && print_stderr != :debug
raise ArgumentError, "`print_stderr` is not a valid symbol"
end
@sudo = sudo @sudo = sudo
@sudo_as_root = sudo_as_root @sudo_as_root = sudo_as_root
@ -128,7 +145,7 @@ class SystemCommand
attr_reader :executable, :args, :input, :chdir, :env attr_reader :executable, :args, :input, :chdir, :env
attr_predicate :sudo?, :sudo_as_root?, :print_stdout?, :print_stderr?, :must_succeed? attr_predicate :sudo?, :sudo_as_root?, :must_succeed?
sig { returns(T::Boolean) } sig { returns(T::Boolean) }
def debug? def debug?