diff options
| author | Xu Cheng | 2015-03-12 23:35:24 +0800 |
|---|---|---|
| committer | Xu Cheng | 2015-03-13 18:43:42 +0800 |
| commit | 6dc9506edca9ffc730abd8ae4dcb352afa9e2f95 (patch) | |
| tree | feef38a1134879c2afdb33ff7e71b662eee8fcb5 | |
| parent | 83080be4c1c84290bed5ed077bcb37f243c106d4 (diff) | |
| download | brew-6dc9506edca9ffc730abd8ae4dcb352afa9e2f95.tar.bz2 | |
java overridable_java_home_env
Closes Homebrew/homebrew#37622
| -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 |
