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

mac/java_requirement: avoid adding/removing stub.

Browse Source
This commit is contained in:
Mike McQuaid 2017-03-05 11:26:30 +01:00 committed by GitHub
parent ea28c79031
commit 960768d8ed
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -12,9 +12,10 @@ 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")
javas.delete(Pathname.new("/usr/bin/java")) # /usr/bin/java is a stub on macOS # /usr/bin/java is a stub on macOS
javas.compact javas << which_java if which_java.to_s != "/usr/bin/java"
javas
end end
def java_home_cmd def java_home_cmd