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

Align how local provisioner looks with shell provisioner

This commit is contained in:
Brian Cain 2018-03-30 13:07:39 -07:00
parent a857056136
commit a1e4fe4411
No known key found for this signature in database
GPG Key ID: 43D51080D357A001
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -159,11 +159,11 @@ module Vagrant
# TODO: I18n me # TODO: I18n me
if !config.inline.nil? if !config.inline.nil?
cmd = Shellwords.split(config.inline) cmd = Shellwords.split(config.inline)
@machine.ui.info("Executing local: Inline script") @machine.ui.detail("Running local: Inline script")
else else
cmd = File.expand_path(config.path, @env.root_path) cmd = File.expand_path(config.path, @env.root_path)
FileUtils.chmod("+x", cmd) # TODO: what about windows FileUtils.chmod("+x", cmd) # TODO: what about windows
@machine.ui.info("Executing local: File script #{config.path}") @machine.ui.detail("Running local script: #{config.path}")
end end
begin begin
@ -195,7 +195,7 @@ module Vagrant
end end
end end
# Runs a script on the host # Runs a script on the guest
# #
# @param [ShellProvisioner/Config] config A Shell provisioner config # @param [ShellProvisioner/Config] config A Shell provisioner config
def run_remote(config, on_error) def run_remote(config, on_error)