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

Use configured upload path for winssh communicator

This commit is contained in:
Chris Roberts 2017-04-20 16:05:41 -07:00
parent c2a3978925
commit c963532d6e
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
plugins/provisioners/shell/provisioner.rb
View File

@ -104,8 +104,11 @@ module VagrantPlugins
# Upload the script to the machine
@machine.communicate.tap do |comm|
env = config.env.map{|k,v| comm.generate_environment_export(k, v)}.join
remote_ext = @machine.config.winssh.shell == "powershell" ? "ps1" : "bat"
upload_path = "C:\\Windows\\Temp\\#{File.basename(path)}.#{remote_ext}"
upload_path = config.upload_path.to_s
if File.extname(upload_path).empty?
remote_ext = @machine.config.winssh.shell == "powershell" ? "ps1" : "bat"
upload_path << ".#{remote_ext}"
end
if remote_ext == "ps1"
# Copy powershell_args from configuration
shell_args = config.powershell_args