Merge pull request #18 from buty4649/combinedout

Refactor output handling in runCommand function
buty4649 · Mar 24, 2024 · ab4a723 · ab4a723
2 parents 2539fc0 + c18d77d
commit ab4a723
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/iproute2/base.go b/iproute2/base.go
@@ -81,17 +81,16 @@ func (b *BaseCommand) runCommand(cmd []string, input *string) (string, error) {
 		}()
 	}
 
-	stdout, err := c.Output()
+	out, err := c.CombinedOutput()
 	if err != nil {
 		exitErr, _ := err.(*exec.ExitError)
 		status, _ := exitErr.Sys().(syscall.WaitStatus)
-		stderr := string(exitErr.Stderr)
 		return "", &CommandError{
 			ExitStatus: status.ExitStatus(),
-			Msg:        stderr,
+			Msg:        string(out),
 		}
 	}
-	return string(stdout), nil
+	return string(out), nil
 }
 
 func (b *BaseCommand) AddLink(name string, linkType string, options ...string) error {