Commit 821ba69f authored by Fabio Pelosin's avatar Fabio Pelosin

[Setup] Checkout the 0.6 branch of the master repo.

parent dcd85e72
...@@ -70,12 +70,19 @@ module Pod ...@@ -70,12 +70,19 @@ module Pod
end end
end end
def add_master_repo_command def add_master_repo
@command ||= Repo.new(ARGV.new(['add', 'master', url])) @command ||= Repo.new(ARGV.new(['add', 'master', url, '0.6'])).run
end end
def update_master_repo_command def update_master_repo
Repo.new(ARGV.new(['update', 'master'])) Repo.new(ARGV.new(['update', 'master'])).run
end
#TODO: remove after rc
def set_master_repo_branch
Dir.chdir(dir) do
git("checkout 0.6")
end
end end
def run_if_needed def run_if_needed
...@@ -85,9 +92,10 @@ module Pod ...@@ -85,9 +92,10 @@ module Pod
def run def run
if dir.exist? if dir.exist?
set_master_repo_url set_master_repo_url
update_master_repo_command.run set_master_repo_branch
update_master_repo
else else
add_master_repo_command.run add_master_repo
end end
# Mainly so the specs run with submodule repos # Mainly so the specs run with submodule repos
if (dir + '.git/hooks').exist? if (dir + '.git/hooks').exist?
...@@ -95,7 +103,7 @@ module Pod ...@@ -95,7 +103,7 @@ module Pod
hook.open('w') { |f| f << "#!/bin/sh\nrake lint" } hook.open('w') { |f| f << "#!/bin/sh\nrake lint" }
`chmod +x '#{hook}'` `chmod +x '#{hook}'`
end end
puts "Setup completed (#{push? ? "push" : "read-only"} access)" unless config.silent puts "\nSetup completed (#{push? ? "push" : "read-only"} access)" unless config.silent
end end
end end
end end
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment