java overridable_java_home_env

Closes Homebrew/homebrew#37622
2015-03-12 23:35:24 +08:00 · 2015-03-12 23:35:24 +08:00 · 6dc9506edc
commit 6dc9506edc
parent 83080be4c1
1 changed files with 10 additions and 2 deletions
--- a/Library/Homebrew/language/java.rb
+++ b/Library/Homebrew/language/java.rb
@ -1,8 +1,16 @@
 module Language
  module Java
-    def self.java_home_env(version=nil)
+    def self.java_home_cmd(version=nil)
      version_flag = " --version #{version}" if version
-      { :JAVA_HOME => "$(/usr/libexec/java_home#{version_flag})" }
+      "/usr/libexec/java_home#{version_flag}"
+    end
+
+    def self.java_home_env(version=nil)
+      { :JAVA_HOME => "$(#{java_home_cmd(version)})" }
+    end
+
+    def self.overridable_java_home_env(version=nil)
+      { :JAVA_HOME => "${JAVA_HOME:-$(#{java_home_cmd(version)})}" }
    end
  end
 end