diff options
Diffstat (limited to 'Library')
| -rw-r--r-- | Library/Homebrew/requirements/java_requirement.rb | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/Library/Homebrew/requirements/java_requirement.rb b/Library/Homebrew/requirements/java_requirement.rb index 448ebb7e4..93650d413 100644 --- a/Library/Homebrew/requirements/java_requirement.rb +++ b/Library/Homebrew/requirements/java_requirement.rb @@ -5,7 +5,12 @@ class JavaRequirement < Requirement cask "java" download "http://www.oracle.com/technetwork/java/javase/downloads/index.html" - satisfy(:build_env => false) { java_version } + satisfy :build_env => false do + args = %w[--failfast] + args << "--version" << "#{@version}" if @version + @java_home = Utils.popen_read("/usr/libexec/java_home", *args).chomp + $?.success? + end env do java_home = Pathname.new(@java_home) @@ -24,13 +29,6 @@ class JavaRequirement < Requirement super end - def java_version - args = %w[--failfast] - args << "--version" << "#{@version}" if @version - @java_home = Utils.popen_read("/usr/libexec/java_home", *args).chomp - $?.success? - end - def message version_string = " #{@version}" if @version |