pull temp file writing into its own function for easier testing
This commit is contained in:
parent
6dc4b1cbdc
commit
67739270bb
|
@ -26,29 +26,12 @@ func Run(ui packer.Ui, config *Config) (bool, error) {
|
||||||
// If we have an inline script, then turn that into a temporary
|
// If we have an inline script, then turn that into a temporary
|
||||||
// shell script and use that.
|
// shell script and use that.
|
||||||
if config.Inline != nil {
|
if config.Inline != nil {
|
||||||
tf, err := ioutil.TempFile("", "packer-shell")
|
tempScriptFileName, err := createInlineScriptFile(config)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return false, fmt.Errorf("Error preparing shell script: %s", err)
|
return false, err
|
||||||
}
|
}
|
||||||
defer os.Remove(tf.Name())
|
defer os.Remove(tempScriptFileName)
|
||||||
|
scripts = append(scripts, tempScriptFileName)
|
||||||
// Set the path to the temporary file
|
|
||||||
scripts = append(scripts, tf.Name())
|
|
||||||
|
|
||||||
// Write our contents to it
|
|
||||||
writer := bufio.NewWriter(tf)
|
|
||||||
writer.WriteString(fmt.Sprintf("#!%s\n", config.InlineShebang))
|
|
||||||
for _, command := range config.Inline {
|
|
||||||
if _, err := writer.WriteString(command + "\n"); err != nil {
|
|
||||||
return false, fmt.Errorf("Error preparing shell script: %s", err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if err := writer.Flush(); err != nil {
|
|
||||||
return false, fmt.Errorf("Error preparing shell script: %s", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
tf.Close()
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Create environment variables to set before executing the command
|
// Create environment variables to set before executing the command
|
||||||
|
@ -91,6 +74,29 @@ func Run(ui packer.Ui, config *Config) (bool, error) {
|
||||||
return true, nil
|
return true, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func createInlineScriptFile(config *Config) (string, error) {
|
||||||
|
tf, err := ioutil.TempFile("", "packer-shell")
|
||||||
|
if err != nil {
|
||||||
|
return "", fmt.Errorf("Error preparing shell script: %s", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Write our contents to it
|
||||||
|
writer := bufio.NewWriter(tf)
|
||||||
|
writer.WriteString(fmt.Sprintf("#!%s\n", config.InlineShebang))
|
||||||
|
for _, command := range config.Inline {
|
||||||
|
if _, err := writer.WriteString(command + "\n"); err != nil {
|
||||||
|
return "", fmt.Errorf("Error preparing shell script: %s", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := writer.Flush(); err != nil {
|
||||||
|
return "", fmt.Errorf("Error preparing shell script: %s", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
tf.Close()
|
||||||
|
return tf.Name(), nil
|
||||||
|
}
|
||||||
|
|
||||||
// Generates the final command to send to the communicator, using either the
|
// Generates the final command to send to the communicator, using either the
|
||||||
// user-provided ExecuteCommand or defaulting to something that makes sense for
|
// user-provided ExecuteCommand or defaulting to something that makes sense for
|
||||||
// the host OS
|
// the host OS
|
||||||
|
|
Loading…
Reference in New Issue