From 3b8f3ad409546aadea78a6de46235785238e7922 Mon Sep 17 00:00:00 2001 From: Eloy Duran Date: Fri, 11 Sep 2009 20:09:39 +0200 Subject: [PATCH] Made the output of updating a bit nicer and log more if --verbose. --- Library/Homebrew/refresh_brew.rb | 12 +++++++++--- bin/brew | 3 ++- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/Library/Homebrew/refresh_brew.rb b/Library/Homebrew/refresh_brew.rb index 18183e292f..37892e51b7 100644 --- a/Library/Homebrew/refresh_brew.rb +++ b/Library/Homebrew/refresh_brew.rb @@ -27,7 +27,7 @@ class RefreshBrew end def current_revision - in_prefix { `#{REVISION_COMMAND}`.strip } + in_prefix { execute(REVISION_COMMAND).strip } end private @@ -36,11 +36,17 @@ class RefreshBrew Dir.chdir(HOMEBREW_PREFIX) { yield } end + def execute(cmd) + out = `#{cmd}` + ohai "#{cmd}: #{out}" if ARGV.verbose? + out + end + def git_checkout_masterbrew! - in_prefix { `#{CHECKOUT_COMMAND}` } + in_prefix { execute CHECKOUT_COMMAND } end def git_pull! - in_prefix { `#{UPDATE_COMMAND}` } + in_prefix { execute UPDATE_COMMAND } end end \ No newline at end of file diff --git a/bin/brew b/bin/brew index 1c57a5b2fd..e2e42d2b7a 100755 --- a/bin/brew +++ b/bin/brew @@ -113,10 +113,11 @@ begin when 'up', 'update' require 'refresh_brew' updater = RefreshBrew.new + old_revision = updater.current_revision unless updater.update_from_masterbrew! ohai "Already up-to-date." else - ohai "Updated Homebrew to: #{updater.current_revision}" + ohai "Updated Homebrew from #{old_revision} to #{updater.current_revision}." if updater.pending_formulae_changes? ohai "The following formulae were updated: #{updater.updated_formulae.join(', ')}" else