diff options
| author | Adam Edwards <adamed@opscode.com> | 2014-06-14 20:59:44 -0700 |
|---|---|---|
| committer | Adam Edwards <adamed@opscode.com> | 2014-10-23 10:43:03 -0700 |
| commit | b070d4796bb9b573c22ec6e094fea7e60d323718 (patch) | |
| tree | df9296d8ffbb5a72aa4139c957e90d3ae0c42bab /lib | |
| parent | 94dc0364dfa99dba3a5dbfbefeb08f41926b5468 (diff) | |
| download | chef-b070d4796bb9b573c22ec6e094fea7e60d323718.tar.gz | |
powershell_script and batch resource guard_interpeter default to parent resource
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/chef/resource/powershell_script.rb | 2 | ||||
| -rw-r--r-- | lib/chef/resource/windows_script.rb | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/lib/chef/resource/powershell_script.rb b/lib/chef/resource/powershell_script.rb index 1b47e7411a..a88fb5701b 100644 --- a/lib/chef/resource/powershell_script.rb +++ b/lib/chef/resource/powershell_script.rb @@ -21,8 +21,6 @@ class Chef class Resource class PowershellScript < Chef::Resource::WindowsScript - set_guard_inherited_attributes(:architecture) - def initialize(name, run_context=nil) super(name, run_context, :powershell_script, "powershell.exe") @convert_boolean_return = false diff --git a/lib/chef/resource/windows_script.rb b/lib/chef/resource/windows_script.rb index 108891e9ba..185424717b 100644 --- a/lib/chef/resource/windows_script.rb +++ b/lib/chef/resource/windows_script.rb @@ -23,12 +23,15 @@ class Chef class Resource class WindowsScript < Chef::Resource::Script + set_guard_inherited_attributes(:architecture) + protected def initialize(name, run_context, resource_name, interpreter_command) super(name, run_context) @interpreter = interpreter_command @resource_name = resource_name + guard_interpreter resource_name end include Chef::Mixin::WindowsArchitectureHelper |