diff options
| author | Marc Chamberland <mchamberland@pbsc.com> | 2019-04-25 23:58:27 -0400 |
|---|---|---|
| committer | Marc Chamberland <mchamberland@pbsc.com> | 2019-04-26 00:24:33 -0400 |
| commit | 0fb79f0a5f8d2c8ca1f9ddb0d0b0267b300dc81f (patch) | |
| tree | 7984d75e847846eb31923fd26ef51e625d55a0d5 /lib/chef/knife/core | |
| parent | 66c0fdeb65c19d267bd501550e60cd16d7bb4901 (diff) | |
| download | chef-0fb79f0a5f8d2c8ca1f9ddb0d0b0267b300dc81f.tar.gz | |
chef-client => Chef::Dist::CLIENT
Signed-off-by: Marc Chamberland <mchamberland@pbsc.com>
Diffstat (limited to 'lib/chef/knife/core')
| -rw-r--r-- | lib/chef/knife/core/bootstrap_context.rb | 3 | ||||
| -rw-r--r-- | lib/chef/knife/core/windows_bootstrap_context.rb | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/lib/chef/knife/core/bootstrap_context.rb b/lib/chef/knife/core/bootstrap_context.rb index 355978c79d..5e987745e6 100644 --- a/lib/chef/knife/core/bootstrap_context.rb +++ b/lib/chef/knife/core/bootstrap_context.rb @@ -19,6 +19,7 @@ require "chef/run_list" require "chef/util/path_helper" require "pathname" +require "chef/dist" class Chef class Knife @@ -169,7 +170,7 @@ class Chef def start_chef # If the user doesn't have a client path configure, let bash use the PATH for what it was designed for - client_path = @chef_config[:chef_client_path] || "chef-client" + client_path = @chef_config[:chef_client_path] || "#{Chef::Dist::CLIENT}" s = "#{client_path} -j /etc/chef/first-boot.json" if @config[:verbosity] && @config[:verbosity] >= 3 s << " -l trace" diff --git a/lib/chef/knife/core/windows_bootstrap_context.rb b/lib/chef/knife/core/windows_bootstrap_context.rb index c7b8666ed0..df69399074 100644 --- a/lib/chef/knife/core/windows_bootstrap_context.rb +++ b/lib/chef/knife/core/windows_bootstrap_context.rb @@ -18,6 +18,7 @@ require "chef/knife/core/bootstrap_context" require "chef/util/path_helper" +require "chef/dist" class Chef class Knife @@ -268,7 +269,7 @@ class Chef end def local_download_path - "%TEMP%\\chef-client-latest.msi" + "%TEMP%\\#{Chef::Dist::CLIENT}-latest.msi" end def msi_url(machine_os = nil, machine_arch = nil, download_context = nil) |