admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Merge pull request #2244 from jonchang/java

Browse Source 
java_requirement: don't consider macOS Java stub
This commit is contained in:
Mike McQuaid 2017-03-05 15:32:00 +01:00 committed by GitHub
commit 45f52f77e5
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Library/Homebrew/extend/os/mac/requirements/java_requirement.rb
View File

@ -12,7 +12,9 @@ class JavaRequirement < Requirement
javas = [] javas = []
javas << Pathname.new(ENV["JAVA_HOME"])/"bin/java" if ENV["JAVA_HOME"] javas << Pathname.new(ENV["JAVA_HOME"])/"bin/java" if ENV["JAVA_HOME"]
javas << java_home_cmd 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 javas
end end