diff options
| author | Mike McQuaid | 2017-03-05 15:32:00 +0100 |
|---|---|---|
| committer | GitHub | 2017-03-05 15:32:00 +0100 |
| commit | 45f52f77e577522a985a88dde84d198513e419c5 (patch) | |
| tree | 8abafdc18b3b267a1e3dfbd2332a98d25c9861a2 | |
| parent | dbf3630a5326be7d0c5dc5f05b604b77cafd5488 (diff) | |
| parent | 960768d8eda8ac3e1904b1f651019315e814a327 (diff) | |
| download | brew-45f52f77e577522a985a88dde84d198513e419c5.tar.bz2 | |
Merge pull request #2244 from jonchang/java
java_requirement: don't consider macOS Java stub
| -rw-r--r-- | Library/Homebrew/extend/os/mac/requirements/java_requirement.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Library/Homebrew/extend/os/mac/requirements/java_requirement.rb b/Library/Homebrew/extend/os/mac/requirements/java_requirement.rb index 5f989bb56..da2dffba0 100644 --- a/Library/Homebrew/extend/os/mac/requirements/java_requirement.rb +++ b/Library/Homebrew/extend/os/mac/requirements/java_requirement.rb @@ -12,7 +12,9 @@ class JavaRequirement < Requirement javas = [] javas << Pathname.new(ENV["JAVA_HOME"])/"bin/java" if ENV["JAVA_HOME"] javas << java_home_cmd - javas << which("java") + which_java = which("java") + # /usr/bin/java is a stub on macOS + javas << which_java if which_java.to_s != "/usr/bin/java" javas end |