diff options
| author | Xu Cheng | 2015-10-30 14:44:43 +0800 |
|---|---|---|
| committer | Xu Cheng | 2015-10-31 20:22:17 +0800 |
| commit | d7a479f55105f277ce96ad1b4385679c93618add (patch) | |
| tree | d301427101b61e00db0c6539c8cafe4378b536e5 /Library | |
| parent | e40e1b7ac777d45724e057fbe40f65f8d672ddf9 (diff) | |
| download | brew-d7a479f55105f277ce96ad1b4385679c93618add.tar.bz2 | |
JavaRequirement: check satisfaction directly
It made less sense to call a method `java_version` when it returns
boolean value.
Closes Homebrew/homebrew#45501.
Signed-off-by: Xu Cheng <xucheng@me.com>
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 |
