From 62b7c44b80406aec3a6366b761f1bc410148f42f Mon Sep 17 00:00:00 2001
From: Xu Cheng
Date: Thu, 12 Mar 2015 23:35:24 +0800
Subject: java overridable_java_home_env

Closes #37622
---
 Library/Homebrew/language/java.rb | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'Library/Homebrew/language/java.rb')

diff --git a/Library/Homebrew/language/java.rb b/Library/Homebrew/language/java.rb
index dd0918380..69cc87f50 100644
--- 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
-- 
cgit v1.2.3