diff options
| author | Xu Cheng | 2015-03-12 23:35:24 +0800 |
|---|---|---|
| committer | Xu Cheng | 2015-03-13 18:43:42 +0800 |
| commit | 62b7c44b80406aec3a6366b761f1bc410148f42f (patch) | |
| tree | 1488f3e94137eb4f4a595ed52761f4af52b6e9db /Library/Homebrew/language | |
| parent | 1fda943c2add0c42d0db42f6bf1b4d77549c8a1e (diff) | |
| download | homebrew-62b7c44b80406aec3a6366b761f1bc410148f42f.tar.bz2 | |
java overridable_java_home_env
Closes #37622
Diffstat (limited to 'Library/Homebrew/language')
| -rw-r--r-- | Library/Homebrew/language/java.rb | 12 |
1 files changed, 10 insertions, 2 deletions
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 |
