aboutsummaryrefslogtreecommitdiffstats
path: root/Library
diff options
context:
space:
mode:
authorAdam Vandenberg2010-05-02 18:12:48 -0700
committerAdam Vandenberg2010-05-02 18:12:48 -0700
commit48a5f6ca7910d63ced0d51efc06787a923b6562b (patch)
tree7541430cac57bbdbab85f241f940ae22476e02b4 /Library
parent639ea39d9c10aaa56208484a48b482ceb891052e (diff)
downloadbrew-48a5f6ca7910d63ced0d51efc06787a923b6562b.tar.bz2
Merge keg_only? blocks in installer.
Diffstat (limited to 'Library')
-rwxr-xr-xLibrary/Homebrew/install.rb29
1 files changed, 15 insertions, 14 deletions
diff --git a/Library/Homebrew/install.rb b/Library/Homebrew/install.rb
index 8a6836bd1..62703ee42 100755
--- a/Library/Homebrew/install.rb
+++ b/Library/Homebrew/install.rb
@@ -130,24 +130,25 @@ def install f
raise "Nothing was installed to #{f.prefix}" unless f.installed?
- # warn the user if stuff was installed outside of their PATH
- paths = ENV['PATH'].split(':').collect{|p| File.expand_path p}
- [f.bin, f.sbin].each do |bin|
- if bin.directory?
- rootbin = (HOMEBREW_PREFIX+bin.basename).to_s
- bin = File.expand_path bin
- unless paths.include? rootbin
- opoo "#{rootbin} is not in your PATH"
- puts "You can amend this by altering your ~/.bashrc file"
- show_summary_heading = true
- end
- end
- end unless f.keg_only?
-
if f.keg_only?
ohai 'Caveats', text_for_keg_only_formula(f)
show_summary_heading = true
else
+ # warn the user if stuff was installed outside of their PATH
+ paths = ENV['PATH'].split(':').collect{|p| File.expand_path p}
+ [f.bin, f.sbin].each do |bin|
+ if bin.directory?
+ rootbin = (HOMEBREW_PREFIX+bin.basename).to_s
+ bin = File.expand_path bin
+ unless paths.include? rootbin
+ opoo "#{rootbin} is not in your PATH"
+ puts "You can amend this by altering your ~/.bashrc file"
+ show_summary_heading = true
+ end
+ end
+ end
+
+ # link from Cellar to Prefix
begin
Keg.new(f.prefix).link
rescue Exception => e