provisioner/shell: remove check for empty env vars config

This commit is contained in:
Jack Pearkes 2013-06-28 14:11:27 +02:00
parent 349b5ab5f3
commit d64797cc44
1 changed files with 1 additions and 7 deletions

View File

@ -62,15 +62,9 @@ func (p *Provisioner) Prepare(raws ...interface{}) error {
} }
if p.config.ExecuteCommand == "" { if p.config.ExecuteCommand == "" {
// Don't leave an empty space if Vars isn't configured
if p.config.Vars == nil {
p.config.ExecuteCommand = "sh {{.Path}}"
} else {
p.config.ExecuteCommand = "{{.Vars}} sh {{.Path}}" p.config.ExecuteCommand = "{{.Vars}} sh {{.Path}}"
} }
}
if p.config.Inline != nil && len(p.config.Inline) == 0 { if p.config.Inline != nil && len(p.config.Inline) == 0 {
p.config.Inline = nil p.config.Inline = nil
} }