diff options
| author | tyler-ball <tyleraball@gmail.com> | 2014-11-13 11:05:10 -0800 |
|---|---|---|
| committer | tyler-ball <tyleraball@gmail.com> | 2014-11-13 11:05:10 -0800 |
| commit | 13fba4b26511382037efb9e36ce84eda1ba569e1 (patch) | |
| tree | 5e3e2dd4094480815d174b08aaea510b3f5cf269 /lib/chef/shell.rb | |
| parent | f5b36609eeb85d060e61293678488490cd382ea1 (diff) | |
| parent | 2f8a0e92db2244b9404472b8ecae52c373d758ea (diff) | |
| download | chef-tball/audit-tests.tar.gz | |
Merge branch 'audit-mode' into tball/audit-teststball/audit-tests
Diffstat (limited to 'lib/chef/shell.rb')
| -rw-r--r-- | lib/chef/shell.rb | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/lib/chef/shell.rb b/lib/chef/shell.rb index 33c10e22a6..c5b8296c63 100644 --- a/lib/chef/shell.rb +++ b/lib/chef/shell.rb @@ -308,9 +308,17 @@ FOOTER elsif ENV['HOME'] && ::File.exist?(File.join(ENV['HOME'], '.chef', 'chef_shell.rb')) File.join(ENV['HOME'], '.chef', 'chef_shell.rb') elsif config[:solo] - "/etc/chef/solo.rb" + if Chef::Platform.windows? + "C:\\chef\\solo.rb" + else + "/etc/chef/solo.rb" + end elsif config[:client] - "/etc/chef/client.rb" + if Chef::Platform.windows? + "C:\\chef\\client.rb" + else + "/etc/chef/client.rb" + end else nil end |