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
commit 608863809a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 2 deletions

View File

@ -161,7 +161,11 @@ module Vagrant
# @param [Provisioners::Shell::Config] config A Shell provisioner config
def run(config, on_error, exit_codes)
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))
else

View File

@ -181,7 +181,7 @@ describe Vagrant::Plugin::V2::Trigger do
exit_codes = trigger.exit_codes
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)
end