admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Merge pull request #6649 from reitermarkus/java-options

Browse Source 
Don't add leading whitespace to `_JAVA_OPTIONS`.
This commit is contained in:
Markus Reiter 2019-10-28 08:01:16 +01:00 committed by GitHub
commit 8215242503
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Library/Homebrew/formula.rb
View File

@ -1706,7 +1706,7 @@ class Formula
TERM: "dumb", TERM: "dumb",
PATH: PATH.new(ENV["PATH"], HOMEBREW_PREFIX/"bin"), PATH: PATH.new(ENV["PATH"], HOMEBREW_PREFIX/"bin"),
HOMEBREW_PATH: nil, HOMEBREW_PATH: nil,
_JAVA_OPTIONS: "#{ENV["_JAVA_OPTIONS"]} -Duser.home=#{HOMEBREW_CACHE}/java_cache", _JAVA_OPTIONS: "#{ENV["_JAVA_OPTIONS"]&.+(" ")}-Duser.home=#{HOMEBREW_CACHE}/java_cache",
GOCACHE: "#{HOMEBREW_CACHE}/go_cache", GOCACHE: "#{HOMEBREW_CACHE}/go_cache",
CARGO_HOME: "#{HOMEBREW_CACHE}/cargo_cache", CARGO_HOME: "#{HOMEBREW_CACHE}/cargo_cache",
} }
@ -2030,7 +2030,7 @@ class Formula
unless ARGV.interactive? unless ARGV.interactive?
stage_env[:HOME] = env_home stage_env[:HOME] = env_home
stage_env[:_JAVA_OPTIONS] = stage_env[:_JAVA_OPTIONS] =
"#{ENV["_JAVA_OPTIONS"]} -Duser.home=#{HOMEBREW_CACHE}/java_cache" "#{ENV["_JAVA_OPTIONS"]&.+(" ")}-Duser.home=#{HOMEBREW_CACHE}/java_cache"
stage_env[:GOCACHE] = "#{HOMEBREW_CACHE}/go_cache" stage_env[:GOCACHE] = "#{HOMEBREW_CACHE}/go_cache"
stage_env[:CARGO_HOME] = "#{HOMEBREW_CACHE}/cargo_cache" stage_env[:CARGO_HOME] = "#{HOMEBREW_CACHE}/cargo_cache"
stage_env[:CURL_HOME] = ENV["CURL_HOME"] || ENV["HOME"] stage_env[:CURL_HOME] = ENV["CURL_HOME"] || ENV["HOME"]