Skip to content

Commit e25cee8

Browse files
authored
Reserve the more verbose logging to debug mode (#237)
1 parent 6f8fc58 commit e25cee8

File tree

1 file changed

+11
-9
lines changed

1 file changed

+11
-9
lines changed

internal/utils/shell.go

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -56,20 +56,22 @@ func RunCommand(cmdStr, usr string) ([]byte, error) {
5656

5757
if os.Getenv("DEBUG") != "" {
5858
log.Printf("> Running command as %s: %s\n", usr, cmdStr)
59-
}
6059

61-
var stdoutBuf, stderrBuf bytes.Buffer
62-
cmd.Stdout = io.MultiWriter(os.Stdout, &stdoutBuf)
63-
cmd.Stderr = io.MultiWriter(os.Stderr, &stderrBuf)
60+
var stdoutBuf, stderrBuf bytes.Buffer
61+
cmd.Stdout = io.MultiWriter(os.Stdout, &stdoutBuf)
62+
cmd.Stderr = io.MultiWriter(os.Stderr, &stderrBuf)
6463

65-
err = cmd.Run()
66-
if err != nil {
67-
if ee, ok := err.(*exec.ExitError); ok {
68-
ee.Stderr = stderrBuf.Bytes()
64+
err = cmd.Run()
65+
if err != nil {
66+
if ee, ok := err.(*exec.ExitError); ok {
67+
ee.Stderr = stderrBuf.Bytes()
68+
}
6969
}
70+
71+
return stdoutBuf.Bytes(), err
7072
}
7173

72-
return stdoutBuf.Bytes(), err
74+
return cmd.Output()
7375
}
7476

7577
func SetFileOwnership(pathToFile, owner string) error {

0 commit comments

Comments
 (0)