Reserve the more verbose logging to debug mode

fly-apps · Jul 9, 2024 · 6e3f8f0 · 6e3f8f0
1 parent 6f8fc58
commit 6e3f8f0
Showing 1 changed file with 11 additions and 9 deletions.
diff --git a/internal/utils/shell.go b/internal/utils/shell.go
@@ -56,20 +56,22 @@ func RunCommand(cmdStr, usr string) ([]byte, error) {
 
 	if os.Getenv("DEBUG") != "" {
 		log.Printf("> Running command as %s: %s\n", usr, cmdStr)
-	}
 
-	var stdoutBuf, stderrBuf bytes.Buffer
-	cmd.Stdout = io.MultiWriter(os.Stdout, &stdoutBuf)
-	cmd.Stderr = io.MultiWriter(os.Stderr, &stderrBuf)
+		var stdoutBuf, stderrBuf bytes.Buffer
+		cmd.Stdout = io.MultiWriter(os.Stdout, &stdoutBuf)
+		cmd.Stderr = io.MultiWriter(os.Stderr, &stderrBuf)
 
-	err = cmd.Run()
-	if err != nil {
-		if ee, ok := err.(*exec.ExitError); ok {
-			ee.Stderr = stderrBuf.Bytes()
+		err = cmd.Run()
+		if err != nil {
+			if ee, ok := err.(*exec.ExitError); ok {
+				ee.Stderr = stderrBuf.Bytes()
+			}
 		}
+
+		return stdoutBuf.Bytes(), err
 	}
 
-	return stdoutBuf.Bytes(), err
+	return cmd.Output()
 }
 
 func SetFileOwnership(pathToFile, owner string) error {