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

Merge pull request #10545 from Bo98/describe_java

Browse Source 
system_config: remove describe_java
This commit is contained in:
Mike McQuaid 2021-02-10 10:34:08 +00:00 committed by GitHub
commit 5048dcf7ec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Library/Homebrew/diagnostic.rb
View File

@ -872,7 +872,6 @@ module Homebrew
"N/A"
end
end
add_info "Java", SystemConfig.describe_java
nil
end

13
Library/Homebrew/system_config.rb
View File

@ -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)