diff --git a/Library/Homebrew/brew.h.rb b/Library/Homebrew/brew.h.rb index 124fda318a..d688cd9375 100644 --- a/Library/Homebrew/brew.h.rb +++ b/Library/Homebrew/brew.h.rb @@ -150,16 +150,19 @@ def install f puts "Type `exit' to return and finalize the installation" puts "Install to this prefix: #{f.prefix}" interactive_shell + nil elsif ARGV.include? '--help' system './configure --help' exit $? else f.prefix.mkpath + beginning=Time.now f.install %w[README ChangeLog COPYING LICENSE COPYRIGHT AUTHORS].each do |file| FileUtils.mv "#{file}.txt", file rescue nil f.prefix.install file rescue nil end + return Time.now-beginning end end end diff --git a/bin/brew b/bin/brew index 7769ed68a0..d2c0ce1483 100755 --- a/bin/brew +++ b/bin/brew @@ -99,9 +99,8 @@ begin require 'keg' f=ARGV.formulae.shift raise "#{f.name} is already installed" if f.installed? unless ARGV.force? - BEGINNING=Time.now begin - install f + build_time=install f ohai "Caveats", f.caveats, '' ohai 'Finishing up' clean f @@ -111,7 +110,9 @@ begin f.prefix.rmtree if f.prefix.directory? raise end - puts "#{f.prefix}: #{f.prefix.abv}, built in #{pretty_duration Time.now-BEGINNING}" + print "#{f.prefix}: #{f.prefix.abv}" + print ", built in #{pretty_duration build_time}" if build_time + puts when 'ln', 'link' ARGV.kegs.each {|keg| puts "#{keg.link} links created for #{keg}"}