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

Merge pull request #10405 from briancain/fixup-inline-windows-trigger-run 

Fixes #10393: Only use Shellwords on non-windows hosts
This commit is contained in:
Brian Cain 2018-11-13 14:25:27 -08:00 committed by GitHub
parent b2e682b0e3 69b3b44505
commit 608863809a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/vagrant/plugin/v2/trigger.rb
View File

@ -161,7 +161,11 @@ module Vagrant
# @param [Provisioners::Shell::Config] config A Shell provisioner config # @param [Provisioners::Shell::Config] config A Shell provisioner config
def run(config, on_error, exit_codes) def run(config, on_error, exit_codes)
if config.inline if config.inline
cmd = Shellwords.split(config.inline) if Vagrant::Util::Platform.windows?
cmd = config.inline
else
cmd = Shellwords.split(config.inline)
end
@machine.ui.detail(I18n.t("vagrant.trigger.run.inline", command: config.inline)) @machine.ui.detail(I18n.t("vagrant.trigger.run.inline", command: config.inline))
else else

2
test/unit/vagrant/plugin/v2/trigger_test.rb
View File

@ -181,7 +181,7 @@ describe Vagrant::Plugin::V2::Trigger do
exit_codes = trigger.exit_codes exit_codes = trigger.exit_codes
expect(Vagrant::Util::PowerShell).to receive(:execute_inline). expect(Vagrant::Util::PowerShell).to receive(:execute_inline).
with("echo", "hi", options) with("echo 'hi'", options)
subject.send(:run, shell_config, on_error, exit_codes) subject.send(:run, shell_config, on_error, exit_codes)
end end