diff options
| author | Mike McQuaid | 2017-03-05 11:26:30 +0100 |
|---|---|---|
| committer | GitHub | 2017-03-05 11:26:30 +0100 |
| commit | 960768d8eda8ac3e1904b1f651019315e814a327 (patch) | |
| tree | 16eef5c5d73dfe774c0457dfffc51d44665c8634 | |
| parent | ea28c79031b157e7604ac905e7a09fbe2e603778 (diff) | |
| download | brew-960768d8eda8ac3e1904b1f651019315e814a327.tar.bz2 | |
mac/java_requirement: avoid adding/removing stub.
| -rw-r--r-- | Library/Homebrew/extend/os/mac/requirements/java_requirement.rb | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Library/Homebrew/extend/os/mac/requirements/java_requirement.rb b/Library/Homebrew/extend/os/mac/requirements/java_requirement.rb index ebb80718a..da2dffba0 100644 --- a/Library/Homebrew/extend/os/mac/requirements/java_requirement.rb +++ b/Library/Homebrew/extend/os/mac/requirements/java_requirement.rb @@ -12,9 +12,10 @@ class JavaRequirement < Requirement javas = [] javas << Pathname.new(ENV["JAVA_HOME"])/"bin/java" if ENV["JAVA_HOME"] javas << java_home_cmd - javas << which("java") - javas.delete(Pathname.new("/usr/bin/java")) # /usr/bin/java is a stub on macOS - javas.compact + 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 def java_home_cmd |
