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

Merge pull request #10118 from briancain/TRIGGER-SPACE-PATH 

Allow for spaces in `path` for trigger run option
This commit is contained in:
Brian Cain 2018-08-17 15:29:07 -07:00 committed by GitHub
parent 6dab92f209 5723c7181a
commit 6a57ae74a8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -157,7 +157,7 @@ module Vagrant
@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
cmd = File.expand_path(config.path, @env.root_path) cmd = File.expand_path(config.path, @env.root_path).shellescape
args = Array(config.args) args = Array(config.args)
cmd << " #{args.join(' ')}" if !args.empty? cmd << " #{args.join(' ')}" if !args.empty?
cmd = Shellwords.split(cmd) cmd = Shellwords.split(cmd)

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

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