aboutsummaryrefslogtreecommitdiffstats
path: root/Library
diff options
context:
space:
mode:
authorMax Howell2009-08-08 14:10:32 +0100
committerMax Howell2009-08-10 18:11:23 +0100
commitf724f5ed52fa9576437e0495ba9ba84ade7e0aea (patch)
tree9727a31ed14e13fc7addfc89c88cd044056d40a1 /Library
parent69c076e741f1403add500c6c0fd618522aa8d79e (diff)
downloadbrew-f724f5ed52fa9576437e0495ba9ba84ade7e0aea.tar.bz2
Ensure ENV is pristine for each installation
Because we modified the ENV global each install this propagated to consecutive formulae. So exec a new brew process each install. This is the safest way although Ruby exceptions don't propagate to the parent process so I worry about it somewhat.
Diffstat (limited to 'Library')
-rw-r--r--Library/Homebrew/brew.h.rb2
-rw-r--r--Library/Homebrew/keg.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/Library/Homebrew/brew.h.rb b/Library/Homebrew/brew.h.rb
index a858a0bf2..8f5408e1b 100644
--- a/Library/Homebrew/brew.h.rb
+++ b/Library/Homebrew/brew.h.rb
@@ -179,7 +179,7 @@ def prune
else
# always showing symlinks text is deliberate
print "Pruned #{$n} symbolic links "
- print "and #{$n} directories " if $d > 0
+ print "and #{$d} directories " if $d > 0
puts "from #{HOMEBREW_PREFIX}"
end
end
diff --git a/Library/Homebrew/keg.rb b/Library/Homebrew/keg.rb
index 69e11983d..a2ef1701c 100644
--- a/Library/Homebrew/keg.rb
+++ b/Library/Homebrew/keg.rb
@@ -38,7 +38,7 @@ class Keg <Pathname
# these dirs REMEMBER that *NOT* everything needs to be in the main tree
link_dir('etc') {:mkpath}
link_dir('bin') {:link}
- link_dir('lib') {|path| :mkpath if %w[pkgconfig php].include? path.to_s}
+ link_dir('lib') {|path| :mkpath if %w[pkgconfig php perl5].include? path.to_s}
link_dir('include') {:link}
link_dir('share') {|path| :mkpath if mkpaths.include? path.to_s}