From 8ff7b58cba948eac1120f5f6a5a8ac1f4a45cd96 Mon Sep 17 00:00:00 2001 From: Bo Anderson Date: Tue, 9 Feb 2021 20:58:30 +0000 Subject: [PATCH] system_config: remove describe_java --- Library/Homebrew/diagnostic.rb | 1 - Library/Homebrew/system_config.rb | 13 +------------ 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/Library/Homebrew/diagnostic.rb b/Library/Homebrew/diagnostic.rb index 62efe3feaf..ade58101d1 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 6702c71635..14f16388ca 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 (?[\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)