iSharkFly-Docs
/
packer-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2210 from mitchellh/b-set-e 

provisioner/shell: set -e for inline [GH-2069]
This commit is contained in:
Mitchell Hashimoto 2015-06-11 17:19:43 -04:00
parent 8ca8bd7866 3ed73852be
commit b28f946be9
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
provisioner/shell/provisioner.go
View File

@ -94,7 +94,7 @@ func (p *Provisioner) Prepare(raws ...interface{}) error {
} }
if p.config.InlineShebang == "" { if p.config.InlineShebang == "" {
p.config.InlineShebang = "/bin/sh" p.config.InlineShebang = "/bin/sh -e"
} }
if p.config.RawStartRetryTimeout == "" { if p.config.RawStartRetryTimeout == "" {

4
website/source/docs/provisioners/shell.html.markdown
View File

@ -66,8 +66,10 @@ Optional parameters:
* `inline_shebang` (string) - The * `inline_shebang` (string) - The
[shebang](http://en.wikipedia.org/wiki/Shebang_%28Unix%29) value to use when [shebang](http://en.wikipedia.org/wiki/Shebang_%28Unix%29) value to use when
running commands specified by `inline`. By default, this is `/bin/sh`. running commands specified by `inline`. By default, this is `/bin/sh -e`.
If you're not using `inline`, then this configuration has no effect. If you're not using `inline`, then this configuration has no effect.
**Important:** If you customize this, be sure to include something like
the `-e` flag, otherwise individual steps failing won't fail the provisioner.
* `remote_path` (string) - The path where the script will be uploaded to * `remote_path` (string) - The path where the script will be uploaded to
in the machine. This defaults to "/tmp/script.sh". This value must be in the machine. This defaults to "/tmp/script.sh". This value must be