Commit 6aacf201 authored by Mitchell Hashimoto's avatar Mitchell Hashimoto

builder/vmware: convert line endings in workstation to Unix-style

parent 8ac86e49
......@@ -155,5 +155,10 @@ func (d *Workstation9Driver) runAndLog(cmd *exec.Cmd) (string, string, error) {
log.Printf("stdout: %s", stdoutString)
log.Printf("stderr: %s", stderrString)
return stdout.String(), stderr.String(), err
// Replace these for Windows, we only want to deal with Unix
// style line endings.
returnStdout := strings.Replace(stdout.String(), "\r\n", "\n", -1)
returnStderr := strings.Replace(stderr.String(), "\r\n", "\n", -1)
return returnStdout, returnStderr, err
}
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment