From 3b35af63f608438b1882756feca94a6ebdd0d6a3 Mon Sep 17 00:00:00 2001 From: Caleb Xu Date: Mon, 14 Jun 2021 21:37:32 -0400 Subject: [PATCH] language/java: use shortened brew paths --- Library/Homebrew/language/java.rb | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/Library/Homebrew/language/java.rb b/Library/Homebrew/language/java.rb index bea3b6fd92..c8772e708f 100644 --- a/Library/Homebrew/language/java.rb +++ b/Library/Homebrew/language/java.rb @@ -36,13 +36,26 @@ module Language end private_class_method :java_home_shell + def self.short_java_home_shell(version = nil) + Utils.shortened_brew_path(java_home(version)) + end + private_class_method :short_java_home_shell + def self.java_home_env(version = nil) { JAVA_HOME: java_home_shell(version) } end + def self.short_java_home_env(version = nil) + { JAVA_HOME: short_java_home_shell(version) } + end + def self.overridable_java_home_env(version = nil) { JAVA_HOME: "${JAVA_HOME:-#{java_home_shell(version)}}" } end + + def self.overridable_short_java_home_env(version = nil) + { JAVA_HOME: "${JAVA_HOME:-#{short_java_home_shell(version)}}" } + end end end