summaryrefslogtreecommitdiff
path: root/lib/chef/shell.rb
diff options
context:
space:
mode:
authorJay Mundrawala <jdmundrawala@gmail.com>2014-11-14 14:13:42 -0800
committerJay Mundrawala <jdmundrawala@gmail.com>2014-11-14 14:13:42 -0800
commit3eb5e743a4952a9ddaef00b74e2c8ba116bf43e8 (patch)
tree6204c92f29fbb36656fd710b31c3cc7d7c4779c9 /lib/chef/shell.rb
parent136fe8af2e37d66765412a4fa01067aa10e87f12 (diff)
downloadchef-3eb5e743a4952a9ddaef00b74e2c8ba116bf43e8.tar.gz
Use platform_specific_path in chef shelljdmundrawala/path-sep-refactor
Diffstat (limited to 'lib/chef/shell.rb')
-rw-r--r--lib/chef/shell.rb12
1 files changed, 2 insertions, 10 deletions
diff --git a/lib/chef/shell.rb b/lib/chef/shell.rb
index c5b8296c63..fed32b3795 100644
--- a/lib/chef/shell.rb
+++ b/lib/chef/shell.rb
@@ -308,17 +308,9 @@ 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]
- if Chef::Platform.windows?
- "C:\\chef\\solo.rb"
- else
- "/etc/chef/solo.rb"
- end
+ Chef::Config.platform_specific_path("/etc/chef/solo.rb")
elsif config[:client]
- if Chef::Platform.windows?
- "C:\\chef\\client.rb"
- else
- "/etc/chef/client.rb"
- end
+ Chef::Config.platform_specific_path("/etc/chef/client.rb")
else
nil
end