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

Merge pull request #8305 from Bo98/java-plist

Browse Source 
os/mac/system_config: simplify JVM version parsing
This commit is contained in:
Mike McQuaid 2020-08-12 10:52:45 +01:00 committed by GitHub
commit f7f5ef7729
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Library/Homebrew/extend/os/mac/system_config.rb
View File

@ -8,15 +8,10 @@ class SystemConfig
# java_home doesn't exist on all macOSs; it might be missing on older versions. # java_home doesn't exist on all macOSs; it might be missing on older versions.
return "N/A" unless File.executable? "/usr/libexec/java_home" return "N/A" unless File.executable? "/usr/libexec/java_home"
out, _, status = system_command("/usr/libexec/java_home", args: ["--xml", "--failfast"], print_stderr: false) result = system_command("/usr/libexec/java_home", args: ["--xml", "--failfast"], print_stderr: false)
return "N/A" unless status.success? return "N/A" unless result.success?
javas = [] result.plist.map { |jvm| jvm["JVMVersion"] }.uniq.join(", ")
xml = REXML::Document.new(out)
REXML::XPath.each(xml, "//key[text()='JVMVersion']/following-sibling::string") do |item|
javas << item.text
end
javas.uniq.join(", ")
end end
def describe_homebrew_ruby def describe_homebrew_ruby

1
Library/Homebrew/system_config.rb
View File

@ -2,7 +2,6 @@
require "hardware" require "hardware"
require "software_spec" require "software_spec"
require "rexml/document"
require "development_tools" require "development_tools"
require "extend/ENV" require "extend/ENV"