From 6825af924a130a7e64d1b31ab050a91050526d2a Mon Sep 17 00:00:00 2001 From: Jacob Vosmaer Date: Thu, 14 Aug 2014 13:47:34 +0200 Subject: [PATCH] Use Config.project_root --- config/projects/gitlab.rb | 2 +- config/software/gitlab-cookbooks.rb | 2 +- config/software/gitlab-ctl.rb | 2 +- config/software/gitlab-rails.rb | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/config/projects/gitlab.rb b/config/projects/gitlab.rb index 3b816b1..b846785 100644 --- a/config/projects/gitlab.rb +++ b/config/projects/gitlab.rb @@ -35,7 +35,7 @@ dependency "git" dependency "redis" dependency "nginx" dependency "chef-gem" -if system("#{Omnibus.project_root}/support/is_gitlab_ee.sh") || system("#{Omnibus.project_root}/support/is_gitlab_com.sh") +if system("#{Config.project_root}/support/is_gitlab_ee.sh") || system("#{Config.project_root}/support/is_gitlab_com.sh") dependency "remote-syslog" end dependency "runit" diff --git a/config/software/gitlab-cookbooks.rb b/config/software/gitlab-cookbooks.rb index 5eeace1..a0da475 100644 --- a/config/software/gitlab-cookbooks.rb +++ b/config/software/gitlab-cookbooks.rb @@ -22,7 +22,7 @@ dependency "rsync" always_build true -source :path => File.expand_path("files/gitlab-cookbooks", Omnibus.project_root) +source :path => File.expand_path("files/gitlab-cookbooks", Config.project_root) build do command "mkdir -p #{install_dir}/embedded/cookbooks" diff --git a/config/software/gitlab-ctl.rb b/config/software/gitlab-ctl.rb index d000806..9e17e0a 100644 --- a/config/software/gitlab-ctl.rb +++ b/config/software/gitlab-ctl.rb @@ -21,7 +21,7 @@ name "gitlab-ctl" dependency "rsync" dependency "omnibus-ctl" -source :path => File.expand_path("files/gitlab-ctl-commands", Omnibus.project_root) +source :path => File.expand_path("files/gitlab-ctl-commands", Config.project_root) build do block do diff --git a/config/software/gitlab-rails.rb b/config/software/gitlab-rails.rb index 659c879..fb13001 100644 --- a/config/software/gitlab-rails.rb +++ b/config/software/gitlab-rails.rb @@ -19,7 +19,7 @@ name "gitlab-rails" default_version "70ed6ef2a6894042c9bbd92f273542bca2a2374f" # 7.0.0.rc1 -EE = system("#{Omnibus.project_root}/support/is_gitlab_ee.sh") +EE = system("#{Config.project_root}/support/is_gitlab_ee.sh") dependency "ruby" dependency "bundler" @@ -62,7 +62,7 @@ build do # database at this point so that is a problem. This bug is fixed in # acts-as-taggable-on 3.0.0 by # https://github.com/mbleigh/acts-as-taggable-on/commit/ad02dc9bb24ec8e1e79e7e35e2d4bb5910a66d8e - aato_patch = "#{Omnibus.project_root}/config/patches/acts-as-taggable-on-ad02dc9bb24ec8e1e79e7e35e2d4bb5910a66d8e.diff" + aato_patch = "#{Config.project_root}/config/patches/acts-as-taggable-on-ad02dc9bb24ec8e1e79e7e35e2d4bb5910a66d8e.diff" # To make this idempotent, we apply the patch (in case this is a first run) or # we revert and re-apply the patch (if this is a second or later run). -- libgit2 0.21.2