language/java: use shortened brew paths

This commit is contained in:
Caleb Xu 2021-06-14 21:37:32 -04:00
parent e7ab760392
commit 3b35af63f6
No known key found for this signature in database
GPG Key ID: 2F67B6BC86DC4F00

View File

@ -36,13 +36,26 @@ module Language
end end
private_class_method :java_home_shell 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) def self.java_home_env(version = nil)
{ JAVA_HOME: java_home_shell(version) } { JAVA_HOME: java_home_shell(version) }
end 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) def self.overridable_java_home_env(version = nil)
{ JAVA_HOME: "${JAVA_HOME:-#{java_home_shell(version)}}" } { JAVA_HOME: "${JAVA_HOME:-#{java_home_shell(version)}}" }
end end
def self.overridable_short_java_home_env(version = nil)
{ JAVA_HOME: "${JAVA_HOME:-#{short_java_home_shell(version)}}" }
end
end end
end end