diff options
| author | Mike McQuaid | 2017-09-24 19:24:46 +0100 |
|---|---|---|
| committer | Mike McQuaid | 2017-09-24 21:23:59 +0100 |
| commit | 01e9ec9a9f723b2ef89c7adfaea39f9e4db9aede (patch) | |
| tree | ee2cba40aabe7bd2b103f75cb61d5af3a83104d3 /Library/Homebrew/requirements | |
| parent | 9eb51db400261545822c8c03c2e9d587d70e8ad0 (diff) | |
| download | brew-01e9ec9a9f723b2ef89c7adfaea39f9e4db9aede.tar.bz2 | |
Rubocop: automatic rule fixes.
Diffstat (limited to 'Library/Homebrew/requirements')
| -rw-r--r-- | Library/Homebrew/requirements/java_requirement.rb | 4 | ||||
| -rw-r--r-- | Library/Homebrew/requirements/ruby_requirement.rb | 4 |
2 files changed, 3 insertions, 5 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 diff --git a/Library/Homebrew/requirements/ruby_requirement.rb b/Library/Homebrew/requirements/ruby_requirement.rb index acc655924..a9ec8c42d 100644 --- a/Library/Homebrew/requirements/ruby_requirement.rb +++ b/Library/Homebrew/requirements/ruby_requirement.rb @@ -41,9 +41,7 @@ class RubyRequirement < Requirement def rubies rubies = which_all("ruby") ruby_formula = Formula["ruby"] - if ruby_formula && ruby_formula.installed? - rubies.unshift ruby_formula.bin/"ruby" - end + rubies.unshift ruby_formula.bin/"ruby" if ruby_formula&.installed? rubies.uniq end |