Merge pull request #3827 from maxim-belkin/brew-unix-3

Cross-platform java detection

2 files changed, 16 insertions, 9 deletions

diff --git a/Library/Homebrew/extend/os/mac/system_config.rb b/Library/Homebrew/extend/os/mac/system_config.rb
index 796134781..c0a28d3e9 100644
--- a/Library/Homebrew/extend/os/mac/system_config.rb
+++ b/Library/Homebrew/extend/os/mac/system_config.rb
@@ -23,6 +23,19 @@ class SystemConfig
       @ponk.join(", ") unless @ponk.empty?
     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
       return "N/A" unless MacOS::XQuartz.installed?
       "#{MacOS::XQuartz.version} => #{describe_path(MacOS::XQuartz.prefix)}"
diff --git a/Library/Homebrew/system_config.rb b/Library/Homebrew/system_config.rb
index 28eecf951..63e162075 100644
--- a/Library/Homebrew/system_config.rb
+++ b/Library/Homebrew/system_config.rb
@@ -131,16 +131,10 @@ class SystemConfig
     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 which "java"
+      java_version = Utils.popen_read("java", "-version")
       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(", ")
+      java_version[/java version "([\d\._]+)"/, 1] || "N/A"
     end
 
     def describe_git