From d6bba1c4938ea9c9a9d58ba2f209775dd71a8537 Mon Sep 17 00:00:00 2001 From: Jonathan Chang Date: Tue, 2 Feb 2021 18:36:44 +1100 Subject: [PATCH] java: fix java_home on macOS --- Library/Homebrew/extend/os/language/java.rb | 4 ++++ Library/Homebrew/extend/os/mac/language/java.rb | 10 ++++++++++ Library/Homebrew/language/java.rb | 2 ++ 3 files changed, 16 insertions(+) create mode 100644 Library/Homebrew/extend/os/language/java.rb create mode 100644 Library/Homebrew/extend/os/mac/language/java.rb diff --git a/Library/Homebrew/extend/os/language/java.rb b/Library/Homebrew/extend/os/language/java.rb new file mode 100644 index 0000000000..3c1c0372b3 --- /dev/null +++ b/Library/Homebrew/extend/os/language/java.rb @@ -0,0 +1,4 @@ +# typed: strict +# frozen_string_literal: true + +require "extend/os/mac/language/java" if OS.mac? diff --git a/Library/Homebrew/extend/os/mac/language/java.rb b/Library/Homebrew/extend/os/mac/language/java.rb new file mode 100644 index 0000000000..c7a9a01903 --- /dev/null +++ b/Library/Homebrew/extend/os/mac/language/java.rb @@ -0,0 +1,10 @@ +# typed: true +# frozen_string_literal: true + +module Language + module Java + def self.java_home(version = nil) + find_openjdk_formula(version)&.opt_libexec&.join("openjdk.jdk/Contents/Home") + end + end +end diff --git a/Library/Homebrew/language/java.rb b/Library/Homebrew/language/java.rb index 6b019a6658..bea3b6fd92 100644 --- a/Library/Homebrew/language/java.rb +++ b/Library/Homebrew/language/java.rb @@ -45,3 +45,5 @@ module Language end end end + +require "extend/os/language/java"