diff --git a/Library/Homebrew/diagnostic.rb b/Library/Homebrew/diagnostic.rb index 62efe3feaf1b0a4c01fda6f212df496ed63f38cc..ade58101d1ecccc0204e24eab8ab16d8d86a8241 100644 --- a/Library/Homebrew/diagnostic.rb +++ b/Library/Homebrew/diagnostic.rb @@ -872,7 +872,6 @@ module Homebrew "N/A" end end - add_info "Java", SystemConfig.describe_java nil end diff --git a/Library/Homebrew/system_config.rb b/Library/Homebrew/system_config.rb index 6702c71635f4fbbddc076de8da86efb4cd3105f5..14f16388ca4f98281114406eedbfc6a8f3c2f21d 100644 --- a/Library/Homebrew/system_config.rb +++ b/Library/Homebrew/system_config.rb @@ -113,16 +113,6 @@ module SystemConfig `uname -m`.chomp end - sig { returns(String) } - def describe_java - return "N/A" unless which "java" - - _, err, status = system_command("java", args: ["-version"], print_stderr: false) - return "N/A" unless status.success? - - err[/java version "([\d._]+)"/, 1] || "N/A" - end - sig { returns(String) } def describe_git return "N/A" unless Utils::Git.available? @@ -132,7 +122,7 @@ module SystemConfig sig { returns(String) } def describe_curl - out, = system_command(curl_executable, args: ["--version"]) + out, = system_command(curl_executable, args: ["--version"], verbose: false) if /^curl (?<curl_version>[\d.]+)/ =~ out "#{curl_version} => #{curl_executable}" @@ -194,7 +184,6 @@ module SystemConfig f.puts "Clang: #{describe_clang}" f.puts "Git: #{describe_git}" f.puts "Curl: #{describe_curl}" - f.puts "Java: #{describe_java}" if describe_java != "N/A" end def dump_verbose_config(f = $stdout)