From 8fc3c4c8e99a52ed85fc60f670760136d14c6547 Mon Sep 17 00:00:00 2001 From: Xu Cheng Date: Sat, 24 Jan 2015 20:58:02 +0800 Subject: [PATCH] brew-config: check whether java exists in PATH For OS X, we will call `/usr/libexec/java_home` to exam whehter java is installed. Also rename the method to follow the same naming pattern of other similar methods. Closes Homebrew/homebrew#36187. Signed-off-by: Mike McQuaid --- Library/Homebrew/cmd/config.rb | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/Library/Homebrew/cmd/config.rb b/Library/Homebrew/cmd/config.rb index 69914dec07..f5f56d1a66 100644 --- a/Library/Homebrew/cmd/config.rb +++ b/Library/Homebrew/cmd/config.rb @@ -119,9 +119,13 @@ module Homebrew s end - def java_version - java = `java -version 2>&1`.lines.first.chomp - java =~ /java version "(.+?)"/ ? $1 : java + def describe_java + if which("java").nil? || !quiet_system("/usr/libexec/java_home --failfast") + "N/A" + else + java = `java -version 2>&1`.lines.first.chomp + java =~ /java version "(.+?)"/ ? $1 : java + end end def dump_verbose_config(f=$stdout) @@ -145,6 +149,6 @@ module Homebrew f.puts "Perl: #{describe_perl}" f.puts "Python: #{describe_python}" f.puts "Ruby: #{describe_ruby}" - f.puts "Java: #{java_version}" + f.puts "Java: #{describe_java}" end end