mac/java_requirement: avoid adding/removing stub.

2017-03-05 11:26:30 +01:00 · 2017-03-05 11:26:30 +01:00 · 960768d8ed
commit 960768d8ed
parent ea28c79031
1 changed files with 4 additions and 3 deletions
--- 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