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

Merge pull request #10116 from briancain/fix-run-arg-trigger 

Ensure trigger run args are an array prior to join
This commit is contained in:
Brian Cain 2018-08-17 15:10:52 -07:00 committed by GitHub
parent c9a31f7800 8bce4f3828
commit 57c48ee348
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -158,7 +158,8 @@ module Vagrant
@machine.ui.detail(I18n.t("vagrant.trigger.run.inline", command: config.inline))
else
cmd = File.expand_path(config.path, @env.root_path)
cmd << " #{config.args.join(' ' )}" if config.args
args = Array(config.args)
cmd << " #{args.join(' ')}" if !args.empty?
cmd = Shellwords.split(cmd)
@machine.ui.detail(I18n.t("vagrant.trigger.run.script", path: config.path))

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

@ -131,11 +131,11 @@ describe Vagrant::Plugin::V2::Trigger do
{info: "hi", run: {inline: "echo 'hi'", env: {"KEY"=>"VALUE"}},
exit_codes: [0,50]} }
let(:path_block) { {warn: "bye",
run: {path: "script.sh", env: {"KEY"=>"VALUE"}},
run: {path: "script.sh", args: "HELLO", env: {"KEY"=>"VALUE"}},
on_error: :continue} }
let(:path_block_ps1) { {warn: "bye",
run: {path: "script.ps1", env: {"KEY"=>"VALUE"}},
run: {path: "script.ps1", args: ["HELLO", "THERE"], env: {"KEY"=>"VALUE"}},
on_error: :continue} }
let(:exit_code) { 0 }
@ -197,7 +197,7 @@ describe Vagrant::Plugin::V2::Trigger do
exit_codes = trigger.exit_codes
expect(Vagrant::Util::PowerShell).to receive(:execute).
with("/vagrant/home/script.ps1", options)
with("/vagrant/home/script.ps1", "HELLO", "THERE", options)
subject.send(:run, shell_config, on_error, exit_codes)
end
@ -227,7 +227,7 @@ describe Vagrant::Plugin::V2::Trigger do
exit_codes = trigger.exit_codes
expect(Vagrant::Util::Subprocess).to receive(:execute).
with("/vagrant/home/script.sh", options)
with("/vagrant/home/script.sh", "HELLO", options)
subject.send(:run, shell_config, on_error, exit_codes)
end
@ -243,7 +243,7 @@ describe Vagrant::Plugin::V2::Trigger do
exit_codes = trigger.exit_codes
expect(Vagrant::Util::Subprocess).to receive(:execute).
with("/vagrant/home/script.sh", options)
with("/vagrant/home/script.sh", "HELLO", options)
subject.send(:run, shell_config, on_error, exit_codes)
end