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

Style cleanup for new name option

This commit is contained in:
Seth Vargo 2015-05-30 20:57:49 -07:00
parent afc02ed681
commit 50c0c487fb
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
plugins/provisioners/shell/config.rb
View File

@ -39,9 +39,6 @@ module VagrantPlugins
if @args && args_valid? if @args && args_valid?
@args = @args.is_a?(Array) ? @args.map { |a| a.to_s } : @args.to_s @args = @args.is_a?(Array) ? @args.map { |a| a.to_s } : @args.to_s
end end
if not(@name.nil?) and not(@name.is_a?(String))
@name = nil
end
end end
def validate(machine) def validate(machine)

8
plugins/provisioners/shell/provisioner.rb
View File

@ -65,9 +65,9 @@ module VagrantPlugins
comm.upload(path.to_s, config.upload_path) comm.upload(path.to_s, config.upload_path)
if not(config.name.nil?) if config.name
@machine.ui.detail(I18n.t("vagrant.provisioners.shell.running", @machine.ui.detail(I18n.t("vagrant.provisioners.shell.running",
script: "Name: #{config.name}")) script: "script: #{config.name}"))
elsif config.path elsif config.path
@machine.ui.detail(I18n.t("vagrant.provisioners.shell.running", @machine.ui.detail(I18n.t("vagrant.provisioners.shell.running",
script: path.to_s)) script: path.to_s))
@ -125,9 +125,9 @@ module VagrantPlugins
command = "powershell #{shell_args.to_s} -file #{command}" if command = "powershell #{shell_args.to_s} -file #{command}" if
File.extname(exec_path).downcase == '.ps1' File.extname(exec_path).downcase == '.ps1'
if not(config.name.nil?) if config.name
@machine.ui.detail(I18n.t("vagrant.provisioners.shell.running", @machine.ui.detail(I18n.t("vagrant.provisioners.shell.running",
script: "Name: #{config.name}")) script: "script: #{config.name}"))
elsif config.path elsif config.path
@machine.ui.detail(I18n.t("vagrant.provisioners.shell.runningas", @machine.ui.detail(I18n.t("vagrant.provisioners.shell.runningas",
local: config.path.to_s, remote: exec_path)) local: config.path.to_s, remote: exec_path))