aboutsummaryrefslogtreecommitdiffstats
path: root/Library/Homebrew/requirements/java_requirement.rb
diff options
context:
space:
mode:
authorMike McQuaid2017-09-25 21:29:03 +0100
committerGitHub2017-09-25 21:29:03 +0100
commita5893036166b9708d705a5060aa85002d5a6be16 (patch)
tree03a254a34d12926540a0be677ffc8c9b9f32d5d0 /Library/Homebrew/requirements/java_requirement.rb
parentac8b58537fe3dd71098a43afcc6a1785dcde1d39 (diff)
parentcf5fdeef1d8e9fd053121145882835b87eec2a43 (diff)
downloadbrew-a5893036166b9708d705a5060aa85002d5a6be16.tar.bz2
Merge pull request #3183 from MikeMcQuaid/rubocop-upgrade
Rubocop: 0.50.0 and Ruby 2.3
Diffstat (limited to 'Library/Homebrew/requirements/java_requirement.rb')
-rw-r--r--Library/Homebrew/requirements/java_requirement.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/Library/Homebrew/requirements/java_requirement.rb b/Library/Homebrew/requirements/java_requirement.rb
index ab6dca51d..de3a33eb4 100644
--- a/Library/Homebrew/requirements/java_requirement.rb
+++ b/Library/Homebrew/requirements/java_requirement.rb
@@ -69,14 +69,14 @@ class JavaRequirement < Requirement
rescue FormulaUnavailableError
nil
end
- javas << jdk.bin/"java" if jdk && jdk.installed?
+ javas << jdk.bin/"java" if jdk&.installed?
javas << which("java")
javas
end
def preferred_java
possible_javas.detect do |java|
- next false unless java && java.executable?
+ next false unless java&.executable?
next true unless @version
next true if satisfies_version(java)
end