diff options
| author | Bob W. Hogg | 2017-02-15 21:47:08 -0800 |
|---|---|---|
| committer | Bob W. Hogg | 2017-02-15 21:47:08 -0800 |
| commit | c49b97dd9c4d65a68494a467d542a42528ea9b38 (patch) | |
| tree | b9e3cd28083f272953a7f037a5fd9d7f941f9d64 /Library/Homebrew/extend | |
| parent | 5a214de68d52eef0bbf99f740dc22c721dd02233 (diff) | |
| download | brew-c49b97dd9c4d65a68494a467d542a42528ea9b38.tar.bz2 | |
Code review cleanups
Diffstat (limited to 'Library/Homebrew/extend')
| -rw-r--r-- | Library/Homebrew/extend/os/linux/requirements/java_requirement.rb | 5 | ||||
| -rw-r--r-- | Library/Homebrew/extend/os/mac/requirements/java_requirement.rb | 7 |
2 files changed, 2 insertions, 10 deletions
diff --git a/Library/Homebrew/extend/os/linux/requirements/java_requirement.rb b/Library/Homebrew/extend/os/linux/requirements/java_requirement.rb index c8cbabb0d..7816f6b6f 100644 --- a/Library/Homebrew/extend/os/linux/requirements/java_requirement.rb +++ b/Library/Homebrew/extend/os/linux/requirements/java_requirement.rb @@ -4,11 +4,8 @@ class JavaRequirement < Requirement default_formula "jdk" env do - next unless @java_home env_java_common - if (Pathname.new(@java_home)/"include").exist? # Oracle JVM - env_oracle_jdk - end + env_oracle_jdk end private diff --git a/Library/Homebrew/extend/os/mac/requirements/java_requirement.rb b/Library/Homebrew/extend/os/mac/requirements/java_requirement.rb index 9c60aff95..451e0001b 100644 --- a/Library/Homebrew/extend/os/mac/requirements/java_requirement.rb +++ b/Library/Homebrew/extend/os/mac/requirements/java_requirement.rb @@ -3,12 +3,7 @@ class JavaRequirement env do env_java_common - java_home = Pathname.new(@java_home) - if (java_home/"include").exist? # Oracle JVM - env_oracle_jdk - else # Apple JVM - env_apple - end + env_oracle_jdk || env_apple end private |