From 1ebc63f232bfc13aa911bd3a722ebb26a8b03384 Mon Sep 17 00:00:00 2001 From: Markus Reiter Date: Sun, 27 Oct 2019 18:27:59 +0100 Subject: [PATCH] Don't add leading whitespace to `_JAVA_OPTIONS`. --- Library/Homebrew/formula.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Library/Homebrew/formula.rb b/Library/Homebrew/formula.rb index 52f2f643c3..3be9be5850 100644 --- a/Library/Homebrew/formula.rb +++ b/Library/Homebrew/formula.rb @@ -1706,7 +1706,7 @@ class Formula TERM: "dumb", PATH: PATH.new(ENV["PATH"], HOMEBREW_PREFIX/"bin"), 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", CARGO_HOME: "#{HOMEBREW_CACHE}/cargo_cache", } @@ -2030,7 +2030,7 @@ class Formula unless ARGV.interactive? stage_env[:HOME] = env_home 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[:CARGO_HOME] = "#{HOMEBREW_CACHE}/cargo_cache" stage_env[:CURL_HOME] = ENV["CURL_HOME"] || ENV["HOME"]