From 0ca4bd030aafeba76730fceec13563ec05ef723a Mon Sep 17 00:00:00 2001 From: Jonathan Chang Date: Thu, 2 Mar 2017 19:45:58 -0800 Subject: [PATCH 1/3] java_requirement: don't consider macOS Java stub --- Library/Homebrew/extend/os/mac/requirements/java_requirement.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/Library/Homebrew/extend/os/mac/requirements/java_requirement.rb b/Library/Homebrew/extend/os/mac/requirements/java_requirement.rb index 5f989bb56e..9bbcba9bef 100644 --- a/Library/Homebrew/extend/os/mac/requirements/java_requirement.rb +++ b/Library/Homebrew/extend/os/mac/requirements/java_requirement.rb @@ -13,6 +13,7 @@ class JavaRequirement < Requirement 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 end From ea28c79031b157e7604ac905e7a09fbe2e603778 Mon Sep 17 00:00:00 2001 From: Jonathan Chang Date: Thu, 2 Mar 2017 20:31:55 -0800 Subject: [PATCH 2/3] java_requirement: avoid nil in possible_javas --- Library/Homebrew/extend/os/mac/requirements/java_requirement.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Library/Homebrew/extend/os/mac/requirements/java_requirement.rb b/Library/Homebrew/extend/os/mac/requirements/java_requirement.rb index 9bbcba9bef..ebb80718ac 100644 --- a/Library/Homebrew/extend/os/mac/requirements/java_requirement.rb +++ b/Library/Homebrew/extend/os/mac/requirements/java_requirement.rb @@ -14,7 +14,7 @@ class JavaRequirement < Requirement javas << java_home_cmd javas << which("java") javas.delete(Pathname.new("/usr/bin/java")) # /usr/bin/java is a stub on macOS - javas + javas.compact end def java_home_cmd From 960768d8eda8ac3e1904b1f651019315e814a327 Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Sun, 5 Mar 2017 11:26:30 +0100 Subject: [PATCH 3/3] mac/java_requirement: avoid adding/removing stub. --- .../extend/os/mac/requirements/java_requirement.rb | 7 ++++--- 1 file 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 ebb80718ac..da2dffba06 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