Merge branch 'COOK-988'

guillermo · Feb 13, 2012 · 88e9fad · 88e9fad
2 parents f2a0614 + b7f4839
commit 88e9fad
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/powershell/libraries/core.rb b/powershell/libraries/core.rb
@@ -57,7 +57,10 @@ def action_run
 
         # always set the ExecutionPolicy flag
         # see http://technet.microsoft.com/en-us/library/ee176961.aspx
-        @new_resource.flags("#{@new_resource.flags} -ExecutionPolicy RemoteSigned -Command".strip)
+        # Powershell will hang if stdin is redirected
+        # http://connect.microsoft.com/PowerShell/feedback/details/572313/powershell-exe-can-hang-if-stdin-is-redirected
+        @new_resource.flags("#{@new_resource.flags} -ExecutionPolicy RemoteSigned -inputformat none -Command".strip)
+
         # cwd hax...shell_out on windows needs to support proper 'cwd'
         # follow CHEF-2357 for more
         cwd = @new_resource.cwd ? "cd #{@new_resource.cwd} & " : ""

diff --git a/powershell/libraries/helper.rb b/powershell/libraries/helper.rb
@@ -26,7 +26,7 @@ module Helper
 
     def powershell_installed?
       begin
-        cmd = shell_out("#{interpreter} -Command \"& {Get-Host}\"")
+        cmd = shell_out("#{interpreter} -inputformat none  -Command \"& {Get-Host}\"")
         cmd.stderr.empty? && (cmd.stdout =~ /Version\s*:\s*2.0/i)
       rescue Errno::ENOENT
         false