summaryrefslogtreecommitdiff
path: root/Gemfile
diff options
context:
space:
mode:
authorLamont Granquist <lamont@scriptkiddie.org>2019-04-30 11:42:15 -0700
committerLamont Granquist <lamont@scriptkiddie.org>2019-04-30 11:59:28 -0700
commitaf6575fd28ff4bf570e5a3cd3b04e114fd12999f (patch)
tree24051cca0afd0492dc174b54d1990103983e34e2 /Gemfile
parent23dddb873c10c96fc733e15dd31c1775dafe86da (diff)
downloadchef-af6575fd28ff4bf570e5a3cd3b04e114fd12999f.tar.gz
fix chef-bin bundling in omnibus
this file winds up in the embedded lib at: /opt/chef/embedded/lib/ruby/gems/x.y.0/gems/chef-X.Y.Z/Gemfile It needs to find the chef-bin gem from the same library, rather than simply omitting it. The chef-config gem comes in through the chef.gemspec so the lines are different. Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile8
1 files changed, 7 insertions, 1 deletions
diff --git a/Gemfile b/Gemfile
index 71a3efd2a8..3a3caa9be2 100644
--- a/Gemfile
+++ b/Gemfile
@@ -11,7 +11,13 @@ gem "chef", path: "."
gem "ohai", git: "https://github.com/chef/ohai.git", branch: "master"
gem "chef-config", path: File.expand_path("../chef-config", __FILE__) if File.exist?(File.expand_path("../chef-config", __FILE__))
-gem "chef-bin", path: File.expand_path("../chef-bin", __FILE__) if File.exist?(File.expand_path("../chef-bin", __FILE__))
+
+if File.exist?(File.expand_path("../chef-bin", __FILE__))
+ gem "chef-bin", path: File.expand_path("../chef-bin", __FILE__) # bundling in a git checkout
+else
+ gem "chef-bin" # bundling in omnibus
+end
+
gem "cheffish", "~> 14"
group(:omnibus_package) do