From a3945744438447eb2ec9bea943f7efb2b695753a Mon Sep 17 00:00:00 2001 From: Jacob Vosmaer Date: Thu, 14 Aug 2014 22:16:56 +0200 Subject: [PATCH] Sync from project_dir, not from . --- config/software/gitlab-cookbooks.rb | 2 +- config/software/gitlab-ctl.rb | 2 +- config/software/gitlab-rails.rb | 2 +- config/software/gitlab-shell.rb | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/config/software/gitlab-cookbooks.rb b/config/software/gitlab-cookbooks.rb index f09f617..5bae1aa 100644 --- a/config/software/gitlab-cookbooks.rb +++ b/config/software/gitlab-cookbooks.rb @@ -24,5 +24,5 @@ source :path => File.expand_path("files/gitlab-cookbooks", Config.project_root) build do command "mkdir -p #{install_dir}/embedded/cookbooks" - sync ".", "#{install_dir}/embedded/cookbooks/" + sync project_dir, "#{install_dir}/embedded/cookbooks/" end diff --git a/config/software/gitlab-ctl.rb b/config/software/gitlab-ctl.rb index 10cbd45..4355b62 100644 --- a/config/software/gitlab-ctl.rb +++ b/config/software/gitlab-ctl.rb @@ -64,5 +64,5 @@ done command "chmod 755 #{install_dir}/bin/gitlab-ctl" # additional omnibus-ctl commands - sync ".", "#{install_dir}/embedded/service/omnibus-ctl/" + sync project_dir, "#{install_dir}/embedded/service/omnibus-ctl/" end diff --git a/config/software/gitlab-rails.rb b/config/software/gitlab-rails.rb index d580c42..9d7299f 100644 --- a/config/software/gitlab-rails.rb +++ b/config/software/gitlab-rails.rb @@ -87,7 +87,7 @@ build do command "cp db/schema.rb db/schema.rb.bundled" command "mkdir -p #{install_dir}/embedded/service/gitlab-rails" - sync ".", "#{install_dir}/embedded/service/gitlab-rails/", exclude: %w{.git .gitignore} + sync project_dir, "#{install_dir}/embedded/service/gitlab-rails/", exclude: %w{.git .gitignore} # Create a wrapper for the rake tasks of the Rails app erb :dest => "#{install_dir}/bin/gitlab-rake", diff --git a/config/software/gitlab-shell.rb b/config/software/gitlab-shell.rb index f6d5396..2af8868 100644 --- a/config/software/gitlab-shell.rb +++ b/config/software/gitlab-shell.rb @@ -25,7 +25,7 @@ source :git => "https://gitlab.com/gitlab-org/gitlab-shell.git" build do command "mkdir -p #{install_dir}/embedded/service/gitlab-shell" - sync ".", "#{install_dir}/embedded/service/gitlab-shell/", exclude: %{.git .gitignore} + sync project_dir, "#{install_dir}/embedded/service/gitlab-shell/", exclude: %{.git .gitignore} block do env_shebang = "#!/usr/bin/env ruby" `grep -r -l '^#{env_shebang}' #{project_dir}`.split("\n").each do |ruby_script| -- libgit2 0.21.2