executeCommand now returns stdout and stderr combined in output
This commit is contained in:
parent
e4fc9c3a6c
commit
bc92f29900
@ -182,9 +182,9 @@ func executeCommand(cmdline string) (string, error) {
|
|||||||
cmd = append(cmd, cs...)
|
cmd = append(cmd, cs...)
|
||||||
|
|
||||||
if len(cmd) > 1 {
|
if len(cmd) > 1 {
|
||||||
out, err = exec.Command(cmd[0], cmd[1:]...).Output()
|
out, err = exec.Command(cmd[0], cmd[1:]...).CombinedOutput()
|
||||||
} else {
|
} else {
|
||||||
out, err = exec.Command(cmd[0]).Output()
|
out, err = exec.Command(cmd[0]).CombinedOutput()
|
||||||
}
|
}
|
||||||
|
|
||||||
return string(out), err
|
return string(out), err
|
||||||
|
Loading…
Reference in New Issue
Block a user