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

Cross-platform java detection

Browse Source
This commit is contained in:
Maxim Belkin 2018-02-22 14:20:23 +00:00
parent 14d54ed4b6
commit 5536f49305
2 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -23,6 +23,19 @@ class SystemConfig
@ponk.join(", ") unless @ponk.empty? @ponk.join(", ") unless @ponk.empty?
end end
def describe_java
# 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"
java_xml = Utils.popen_read("/usr/libexec/java_home", "--xml", "--failfast", err: :close)
return "N/A" unless $CHILD_STATUS.success?
javas = []
REXML::XPath.each(REXML::Document.new(java_xml), "//key[text()='JVMVersion']/following-sibling::string") do |item|
javas << item.text
end
javas.uniq.join(", ")
end
def describe_xquartz def describe_xquartz
return "N/A" unless MacOS::XQuartz.installed? return "N/A" unless MacOS::XQuartz.installed?
"#{MacOS::XQuartz.version} => #{describe_path(MacOS::XQuartz.prefix)}" "#{MacOS::XQuartz.version} => #{describe_path(MacOS::XQuartz.prefix)}"

12
Library/Homebrew/system_config.rb
View File

@ -131,16 +131,10 @@ class SystemConfig
end end
def describe_java def describe_java
# java_home doesn't exist on all macOSs; it might be missing on older versions. return "N/A" unless which "java"
return "N/A" unless File.executable? "/usr/libexec/java_home" java_version = Utils.popen_read("java", "-version")
java_xml = Utils.popen_read("/usr/libexec/java_home", "--xml", "--failfast", err: :close)
return "N/A" unless $CHILD_STATUS.success? return "N/A" unless $CHILD_STATUS.success?
javas = [] java_version[/java version "([0-9\._]+)"/, 1] || "N/A"
REXML::XPath.each(REXML::Document.new(java_xml), "//key[text()='JVMVersion']/following-sibling::string") do |item|
javas << item.text
end
javas.uniq.join(", ")
end end
def describe_git def describe_git