aboutsummaryrefslogtreecommitdiffstats
path: root/Library/Homebrew/refresh_brew.rb
diff options
context:
space:
mode:
authorEloy Duran2009-09-11 19:39:13 +0200
committerEloy Duran2009-09-17 00:24:11 +0200
commit10e83c2a2c3ef6ec7a7fe99ffeab4bc357cb19ff (patch)
tree860d5990cf8b86e4615478e9f91798d6f3322da4 /Library/Homebrew/refresh_brew.rb
parent0fa5dc02a978b371ed3075a93b6b7b82e5b343bf (diff)
downloadhomebrew-10e83c2a2c3ef6ec7a7fe99ffeab4bc357cb19ff.tar.bz2
Before trying to update, first checkout the masterbrew branch.
Diffstat (limited to 'Library/Homebrew/refresh_brew.rb')
-rw-r--r--Library/Homebrew/refresh_brew.rb6
1 files changed, 6 insertions, 0 deletions
diff --git a/Library/Homebrew/refresh_brew.rb b/Library/Homebrew/refresh_brew.rb
index d3b683fbb..18183e292 100644
--- a/Library/Homebrew/refresh_brew.rb
+++ b/Library/Homebrew/refresh_brew.rb
@@ -1,4 +1,5 @@
class RefreshBrew
+ CHECKOUT_COMMAND = 'git checkout masterbrew'
UPDATE_COMMAND = 'git pull origin masterbrew'
REVISION_COMMAND = 'git log -l -1 --pretty=format:%H'
GIT_UP_TO_DATE = 'Already up-to-date.'
@@ -13,6 +14,7 @@ class RefreshBrew
# Performs an update of the homebrew source. Returns +true+ if a newer
# version was available, +false+ if already up-to-date.
def update_from_masterbrew!
+ git_checkout_masterbrew!
output = git_pull!
output.split("\n").each do |line|
@updated_formulae << $1 if line =~ UPDATED_FORMULA
@@ -34,6 +36,10 @@ class RefreshBrew
Dir.chdir(HOMEBREW_PREFIX) { yield }
end
+ def git_checkout_masterbrew!
+ in_prefix { `#{CHECKOUT_COMMAND}` }
+ end
+
def git_pull!
in_prefix { `#{UPDATE_COMMAND}` }
end