fix output

fleetdm · Nov 10, 2024 · 188a074 · 188a074
1 parent ad557c6
commit 188a074
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/orbit/pkg/zenity/zenity.go b/orbit/pkg/zenity/zenity.go
@@ -115,8 +115,7 @@ func (z *Zenity) ShowInfo(ctx context.Context, opts InfoOptions) error {
 
 func execCmd(ctx context.Context, args ...string) ([]byte, int, error) {
 	cmd := exec.CommandContext(ctx, "zenity", args...)
-	fmt.Println(cmd.String())
-	err := cmd.Run()
+	output, err := cmd.CombinedOutput()
 	if err != nil {
 		var exitCode int // exit 0 ok here if zenity returns an error
 		if cmd.ProcessState != nil {
@@ -125,5 +124,5 @@ func execCmd(ctx context.Context, args ...string) ([]byte, int, error) {
 		return nil, exitCode, err
 	}
 
-	return nil, cmd.ProcessState.ExitCode(), nil
+	return output, cmd.ProcessState.ExitCode(), nil
 }
diff --git a/tools/zenity/main.go b/tools/zenity/main.go
@@ -16,7 +16,7 @@ func main() {
 		Title:    "Zenity Test Entry Title",
 		Text:     "Zenity Test Entry Text",
 		HideText: true,
-		TimeOut:  5 * time.Second,
+		TimeOut:  10 * time.Second,
 	})
 	if err != nil {
 		fmt.Println("Err ShowEntry")
@@ -26,7 +26,7 @@ func main() {
 	err = prompt.ShowInfo(ctx, zenity.InfoOptions{
 		Title:   "Zenity Test Info Title",
 		Text:    "Result: " + string(output),
-		TimeOut: 5 * time.Second,
+		TimeOut: 10 * time.Second,
 	})
 	if err != nil {
 		fmt.Println("Err ShowInfo")