Download as
Browse Code »

Commit 2044611820185217df2d20b9278f40b62f407fce

Authored by Jacob Vosmaer
1 parent 16bbe60f
Exists in master and in 17 other branches 6-6-stable, 6-6-stable-ee, 6-7-stable, 6-7-stable-ee, 6-8-stable, 6-8-stable-ee, 6-9-stable, 6-9-stable-ee, 7-0-stable, 7-0-stable-ee, 7-0-stable-spb, 7-1-stable, 7-1-stable-ee, 7-2-stable, 7-2-stable-ee, branch_test, nginx_ssl_tweaks

Make script wrapper step idempotent

Showing 1 changed file with 1 additions and 0 deletions   Show diff stats
config/software/gitlab-shell.rb
  Diff comments   View file @2044611
@@ -29,6 +29,7 @@ build do @@ -29,6 +29,7 @@ build do
29 env_shebang = "#!/usr/bin/env ruby" 29 env_shebang = "#!/usr/bin/env ruby"
30 `grep -r -l '^#{env_shebang}' #{project_dir}`.split("\n").each do |ruby_script| 30 `grep -r -l '^#{env_shebang}' #{project_dir}`.split("\n").each do |ruby_script|
31 script = File.read(ruby_script) 31 script = File.read(ruby_script)
  32 + next if script.start_with?("#!#{install_dir}") # Shebang looks good, skip this script
32 erb :dest => ruby_script, 33 erb :dest => ruby_script,
33 :source => "ruby_script_wrapper.erb", 34 :source => "ruby_script_wrapper.erb",
34 :mode => 0755, 35 :mode => 0755,