Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

java_requirement: don't consider macOS Java stub #2244

Merged
merged 3 commits into from Mar 5, 2017
Merged

java_requirement: don't consider macOS Java stub #2244

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0ca4bd0
java_requirement: don't consider macOS Java stub
jonchang Mar 3, 2017
ea28c79
java_requirement: avoid nil in possible_javas
jonchang Mar 3, 2017
960768d
mac/java_requirement: avoid adding/removing stub.
MikeMcQuaid Mar 5, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 3 additions & 1 deletion Library/Homebrew/extend/os/mac/requirements/java_requirement.rb
View file
Open in desktop
Expand Up @@ -12,7 +12,9 @@ def possible_javas
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

Expand Down