diff --git a/Library/Homebrew/cmd/info.rb b/Library/Homebrew/cmd/info.rb index a2cceeac5f..eb92087faa 100644 --- a/Library/Homebrew/cmd/info.rb +++ b/Library/Homebrew/cmd/info.rb @@ -371,9 +371,9 @@ module Homebrew def decorate_dependencies(dependencies) deps_status = dependencies.map do |dep| if dep.satisfied?([]) - pretty_installed_string(dep_display_s(dep)) + pretty_installed(dep_display_s(dep)) else - pretty_uninstalled_string(dep_display_s(dep)) + pretty_uninstalled(dep_display_s(dep)) end end deps_status.join(", ") diff --git a/Library/Homebrew/cmd/update-report.rb b/Library/Homebrew/cmd/update-report.rb index 4856100dfb..c74b725e7e 100644 --- a/Library/Homebrew/cmd/update-report.rb +++ b/Library/Homebrew/cmd/update-report.rb @@ -903,7 +903,7 @@ class ReporterHub sig { void } def dump_deleted_formula_report formulae = select_formula_or_cask(:D).sort.filter_map do |name| - pretty_uninstalled_string(name) if installed?(name) + pretty_uninstalled(name) if installed?(name) end output_dump_formula_or_cask_report "Deleted Installed Formulae", formulae @@ -915,7 +915,7 @@ class ReporterHub casks = select_formula_or_cask(:DC).sort.filter_map do |name| name = T.must(name.split("/").last) - pretty_uninstalled_string(name) if cask_installed?(name) + pretty_uninstalled(name) if cask_installed?(name) end output_dump_formula_or_cask_report "Deleted Installed Casks", casks diff --git a/Library/Homebrew/extend/kernel.rb b/Library/Homebrew/extend/kernel.rb index bfc3e03c21..ba9fa60a13 100644 --- a/Library/Homebrew/extend/kernel.rb +++ b/Library/Homebrew/extend/kernel.rb @@ -234,13 +234,8 @@ module Kernel odeprecated(method, replacement, disable: true, disable_on:, disable_for_developers:, caller:) end - sig { params(formula: Formula).returns(String) } - def pretty_installed(formula) - pretty_installed_string(formula.to_s) - end - sig { params(string: String).returns(String) } - def pretty_installed_string(string) + def pretty_installed(string) if !$stdout.tty? string elsif Homebrew::EnvConfig.no_emoji? @@ -250,13 +245,8 @@ module Kernel end end - sig { params(formula: Formula).returns(String) } - def pretty_outdated(formula) - pretty_outdated_string(formula.to_s) - end - sig { params(string: String).returns(String) } - def pretty_outdated_string(string) + def pretty_outdated(string) if !$stdout.tty? string elsif Homebrew::EnvConfig.no_emoji? @@ -266,13 +256,8 @@ module Kernel end end - sig { params(formula: Formula).returns(String) } - def pretty_uninstalled(formula) - pretty_uninstalled_string(formula.to_s) - end - sig { params(string: String).returns(String) } - def pretty_uninstalled_string(string) + def pretty_uninstalled(string) if !$stdout.tty? string elsif Homebrew::EnvConfig.no_emoji?