haskal
/
vagrant
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Allow shell to be defined when calling #execute

This commit is contained in:
Chris Roberts 2017-05-04 18:47:59 -07:00
parent 82550805a0
commit 62edaf5623
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
plugins/communicators/winssh/communicator.rb
View File

@ -19,6 +19,7 @@ module VagrantPlugins
}.merge(opts) }.merge(opts)
sudo = opts[:sudo] sudo = opts[:sudo]
shell = (opts[:shell] || machine_config_ssh.shell).to_s
@logger.info("Execute: #{command} (sudo=#{sudo.inspect})") @logger.info("Execute: #{command} (sudo=#{sudo.inspect})")
exit_status = nil exit_status = nil
@ -31,10 +32,10 @@ module VagrantPlugins
stderr_data_buffer = '' stderr_data_buffer = ''
tfile = Tempfile.new('vagrant-ssh') tfile = Tempfile.new('vagrant-ssh')
remote_ext = machine_config_ssh.shell.to_s == "powershell" ? "ps1" : "bat" remote_ext = shell == "powershell" ? "ps1" : "bat"
remote_name = "C:\\Windows\\Temp\\#{File.basename(tfile.path)}.#{remote_ext}" remote_name = "C:\\Windows\\Temp\\#{File.basename(tfile.path)}.#{remote_ext}"
if machine_config_ssh.shell.to_s == "powershell" if shell == "powershell"
base_cmd = "powershell -File #{remote_name}" base_cmd = "powershell -File #{remote_name}"
tfile.puts <<-SCRIPT.force_encoding('ASCII-8BIT') tfile.puts <<-SCRIPT.force_encoding('ASCII-8BIT')
Remove-Item #{remote_name} Remove-Item #{remote_name}