diff options
| author | Mike McQuaid | 2017-05-21 16:35:03 +0100 |
|---|---|---|
| committer | GitHub | 2017-05-21 16:35:03 +0100 |
| commit | 6d8c170e50b6ee232e4f8958c92735bf411a72e9 (patch) | |
| tree | 29f795ec66e2c262e6b23f03bd2dcadb0a0cd303 /Library/Homebrew/formula.rb | |
| parent | d8565ed21f2dc131340ef7f2240ef1e45a5afb7e (diff) | |
| parent | d89c870621fb78f3b9be4e0758031bcd6bbc3c31 (diff) | |
| download | brew-6d8c170e50b6ee232e4f8958c92735bf411a72e9.tar.bz2 | |
Merge pull request #2660 from MikeMcQuaid/env-filtering-test
formula: ensure HOMEBREW_PREFIX/bin in test PATH.
Diffstat (limited to 'Library/Homebrew/formula.rb')
| -rw-r--r-- | Library/Homebrew/formula.rb | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Library/Homebrew/formula.rb b/Library/Homebrew/formula.rb index 8bcac183f..0b3e87bb1 100644 --- a/Library/Homebrew/formula.rb +++ b/Library/Homebrew/formula.rb @@ -1673,11 +1673,13 @@ class Formula old_temp = ENV["TEMP"] old_tmp = ENV["TMP"] old_term = ENV["TERM"] - old_path = ENV["HOMEBREW_PATH"] + old_path = ENV["PATH"] + old_homebrew_path = ENV["HOMEBREW_PATH"] ENV["CURL_HOME"] = old_curl_home || old_home ENV["TMPDIR"] = ENV["TEMP"] = ENV["TMP"] = HOMEBREW_TEMP ENV["TERM"] = "dumb" + ENV["PATH"] = PATH.new(old_path).append(HOMEBREW_PREFIX/"bin") ENV["HOMEBREW_PATH"] = nil ENV.clear_sensitive_environment! @@ -1704,7 +1706,8 @@ class Formula ENV["TEMP"] = old_temp ENV["TMP"] = old_tmp ENV["TERM"] = old_term - ENV["HOMEBREW_PATH"] = old_path + ENV["PATH"] = old_path + ENV["HOMEBREW_PATH"] = old_homebrew_path @prefix_returns_versioned_prefix = false end |