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

env: make prepend_path ignore system paths

Browse Source 
`ENV.prepend_path "PATH", which("emacs").dirname` in the emacs
requirement was causing us to end up invoking /usr/bin/clang instead
of /usr/local/Homebrew/Library/Homebrew/shims/super/clang.
This commit is contained in:
ilovezfs 2017-03-10 07:28:55 -08:00
parent 371a830028
commit 76db07e1b5
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Library/Homebrew/extend/ENV/shared.rb
View File

@ -87,7 +87,11 @@ module SharedEnvExtension
# Is the formula struggling to find the pkgconfig file? Point it to it.
# This is done automatically for `keg_only` formulae.
# <pre>ENV.prepend_path "PKG_CONFIG_PATH", "#{Formula["glib"].opt_lib}/pkgconfig"</pre>
# Prepending a system path such as /usr/bin is a no-op so that requirements
# don't accidentally override superenv shims or formulae's `bin` directories
# (e.g. <pre>ENV.prepend_path "PATH", which("emacs").dirname</pre>)
def prepend_path(key, path)
return if %w[/usr/bin /bin /usr/sbin /sbin].include? path.to_s
prepend key, path, File::PATH_SEPARATOR if File.directory? path
end

8
Library/Homebrew/test/ENV_spec.rb
View File

@ -115,11 +115,11 @@ shared_examples EnvActivation do
describe "#prepend_path" do
it "prepends to a path" do
subject.prepend_path "FOO", "/usr/bin"
expect(subject["FOO"]).to eq("/usr/bin")
subject.prepend_path "FOO", "/usr/libexec"
expect(subject["FOO"]).to eq("/usr/libexec")
subject.prepend_path "FOO", "/bin"
expect(subject["FOO"]).to eq("/bin#{File::PATH_SEPARATOR}/usr/bin")
subject.prepend_path "FOO", "/usr"
expect(subject["FOO"]).to eq("/usr#{File::PATH_SEPARATOR}/usr/libexec")
end
end