mirror of
https://github.com/skoelle/kctl-tui.git
synced 2026-09-17 20:10:24 +00:00
fix: config error handling, stderr separation, single-env pane, namespace sort
This commit is contained in:
@@ -20,11 +20,21 @@ import (
|
||||
|
||||
func runOutput(name string, args ...string) (string, error) {
|
||||
cmd := exec.Command(name, args...)
|
||||
out, err := cmd.CombinedOutput()
|
||||
var stdout, stderr strings.Builder
|
||||
cmd.Stdout = &stdout
|
||||
cmd.Stderr = &stderr
|
||||
err := cmd.Run()
|
||||
if err != nil {
|
||||
return "", fmt.Errorf("%s %s failed: %w\n%s", name, strings.Join(args, " "), err, string(out))
|
||||
msg := fmt.Sprintf("%s %s failed: %v", name, strings.Join(args, " "), err)
|
||||
if s := strings.TrimSpace(stderr.String()); s != "" {
|
||||
msg += "\n" + s
|
||||
}
|
||||
if s := strings.TrimSpace(stdout.String()); s != "" {
|
||||
msg += "\n" + s
|
||||
}
|
||||
return "", fmt.Errorf("%s", msg)
|
||||
}
|
||||
return strings.TrimSpace(string(out)), nil
|
||||
return strings.TrimSpace(stdout.String()), nil
|
||||
}
|
||||
|
||||
// kubectlArgs prepends a --context flag when context is non-empty.
|
||||
|
||||
Reference in New Issue
Block a user