Commit b205db63 authored by Jacob Vosmaer's avatar Jacob Vosmaer
Browse files

Merge branch 'fix_shell_commands_in_shell_install' into 'master'

Fix shell commands in shell install

Fixes #1610

See merge request !1320
......@@ -17,15 +17,19 @@ namespace :gitlab do
# Clone if needed
unless File.directory?(target_dir)
sh(*%W(git clone #{args.repo} #{target_dir}))
system(*%W(git clone -- #{args.repo} #{target_dir}))
end
# Make sure we're on the right tag
Dir.chdir(target_dir) do
# First try to checkout without fetching
# to avoid stalling tests if the Internet is down.
reset = "git reset --hard $(git describe #{args.tag} || git describe origin/#{args.tag})"
sh "#{reset} || git fetch origin && #{reset}"
reseted = reset_to_commit(args)
unless reseted
system(*%W(git fetch origin))
reset_to_commit(args)
end
config = {
user: user,
......@@ -54,7 +58,7 @@ namespace :gitlab do
File.open("config.yml", "w+") {|f| f.puts config.to_yaml}
# Launch installation process
sh "bin/install"
system(*%W(bin/install))
end
# Required for debian packaging with PKGR: Setup .ssh/environment with
......@@ -118,5 +122,16 @@ namespace :gitlab do
puts "Quitting...".red
exit 1
end
def reset_to_commit(args)
tag, status = Gitlab::Popen.popen(%W(git describe -- #{args.tag}))
unless status.zero?
tag, status = Gitlab::Popen.popen(%W(git describe -- origin/#{args.tag}))
end
tag = tag.strip
system(*%W(git reset --hard #{tag}))
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