Merge pull request #1533 from chef/ma/chef-server-ctl-paths

[chef-server-ctl] Install only appbundled version
chef · Oct 9, 2019 · c9721e7 · c9721e7
2 parents 72b9dcb + 64c897a
commit c9721e7
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/omnibus/config/software/private-chef-ctl.rb b/omnibus/config/software/private-chef-ctl.rb
@@ -35,9 +35,15 @@
   bundle "install", env: env
 
   gem "build chef-server-ctl.gemspec", env: env
-  gem "install chef-server-ctl-*.gem --no-document --verbose", env: env
+
+  # Hack: install binaries in /tmp because we don't actually want them at all
+  gem "install chef-server-ctl-*.gem --no-document --verbose --bindir=/tmp", env: env
 
   appbundle "chef-server-ctl", env: env
 
   link "#{install_dir}/bin/chef-server-ctl", "#{install_dir}/bin/private-chef-ctl"
+
+  # These are necessary until we remove all hardcoded references to embedded/bin/*-ctl
+  link "#{install_dir}/bin/chef-server-ctl", "#{install_dir}/embedded/bin/chef-server-ctl"
+  link "#{install_dir}/bin/chef-server-ctl", "#{install_dir}/embedded/bin/private-chef-ctl"
 end