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

formula: use env helper

Browse Source
This commit is contained in:
Misty De Meo 2017-07-15 17:26:51 -07:00
parent 8e645dfbec
commit 32b7e32856
No known key found for this signature in database
GPG Key ID: 76CF846A2F674B2C
1 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Library/Homebrew/formula.rb
View File

@ -955,14 +955,14 @@ class Formula
build = self.build build = self.build
self.build = Tab.for_formula(self) self.build = Tab.for_formula(self)
old_tmpdir = ENV["TMPDIR"] new_env = {
old_temp = ENV["TEMP"] "TMPDIR" => HOMEBREW_TEMP,
old_tmp = ENV["TMP"] "TEMP" => HOMEBREW_TEMP,
old_path = ENV["HOMEBREW_PATH"] "TMP" => HOMEBREW_TEMP,
"HOMEBREW_PATH" => nil,
ENV["TMPDIR"] = ENV["TEMP"] = ENV["TMP"] = HOMEBREW_TEMP }
ENV["HOMEBREW_PATH"] = nil
with_env(new_env) do
ENV.clear_sensitive_environment! ENV.clear_sensitive_environment!
Pathname.glob("#{bottle_prefix}/{etc,var}/**/*") do |path| Pathname.glob("#{bottle_prefix}/{etc,var}/**/*") do |path|
@ -973,12 +973,9 @@ class Formula
with_logging("post_install") do with_logging("post_install") do
post_install post_install
end end
end
ensure ensure
self.build = build self.build = build
ENV["TMPDIR"] = old_tmpdir
ENV["TEMP"] = old_temp
ENV["TMP"] = old_tmp
ENV["HOMEBREW_PATH"] = old_path
@prefix_returns_versioned_prefix = false @prefix_returns_versioned_prefix = false
end end