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

ensure brewed bins are in path before installing

Browse Source 
This makes sure that formulas find the correct pkg-config.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
This commit is contained in:
Camillo Lugaresi 2010-12-15 22:45:18 +01:00 committed by Adam Vandenberg
parent f43be169fe
commit f4ffb754c3
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Library/Homebrew/install.rb
View File

@ -53,6 +53,12 @@ end
def install f def install f
show_summary_heading = false show_summary_heading = false
paths = ENV['PATH'].split(':').map{ |p| File.expand_path p }
rootbin = (HOMEBREW_PREFIX+'bin').to_s
unless paths.include? rootbin
ENV.prepend 'PATH', rootbin, ':'
end
f.deps.uniq.each do |dep| f.deps.uniq.each do |dep|
dep = Formula.factory dep dep = Formula.factory dep
if dep.keg_only? if dep.keg_only?
@ -149,7 +155,6 @@ def install f
show_summary_heading = true show_summary_heading = true
else else
# warn the user if stuff was installed outside of their PATH # warn the user if stuff was installed outside of their PATH
paths = ENV['PATH'].split(':').map{ |p| File.expand_path p }
[f.bin, f.sbin].each do |bin| [f.bin, f.sbin].each do |bin|
if bin.directory? if bin.directory?
rootbin = (HOMEBREW_PREFIX/bin.basename).to_s rootbin = (HOMEBREW_PREFIX/bin.basename).to_s