Download as
Browse Code »

Commit 6dec05ffb60c3f36c00032f3664ffcb1afbbb761

Authored by Jacob Vosmaer
2 parents 60467877 ea37040c
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

Merge branch 'gitlab_shell_path' into 'master' 

Gitlab Shell Path
Showing 1 changed file with 17 additions and 1 deletions   Show diff stats
config/software/gitlab-shell.rb
  Diff comments   View file @6dec05f
... ... @@ -25,7 +25,23 @@ dependency "rsync"
25 25 source :git => "https://gitlab.com/gitlab-org/gitlab-shell.git"
26 26  
27 27 build do
28   - command "sed -i 's|^#!/usr/bin/env ruby|#!#{install_dir}/embedded/bin/ruby|' $(grep -r -l '#!/usr/bin/env ruby' .)"
  28 + block do
  29 + env_shebang = "#!/usr/bin/env ruby"
  30 + `grep -r -l '^#{env_shebang}' #{project_dir}`.split("\n").each do |ruby_script|
  31 + File.open(ruby_script, "r+") do |file|
  32 + script = file.read
  33 + file.rewind
  34 + file.truncate(0)
  35 + file.print <<-EOH
  36 +#!/opt/gitlab/embedded/bin/ruby
  37 +# Fix the PATH so that gitlab-shell can find git-upload-pack and friends.
  38 +ENV['PATH'] = '/opt/gitlab/bin:/opt/gitlab/embedded/bin:' + ENV['PATH']
  39 +
  40 + EOH
  41 + file.print script.gsub(/^#{env_shebang}\s*/, "")
  42 + end
  43 + end
  44 + end
29 45 command "mkdir -p #{install_dir}/embedded/service/gitlab-shell"
30 46 command "#{install_dir}/embedded/bin/rsync -a --delete --exclude=.git/*** --exclude=.gitignore ./ #{install_dir}/embedded/service/gitlab-shell/"
31 47 end
... ...