Merge pull request #122 from initia-labs/impv/error-cmd

Improve error not show exit code 1

Author: traviolus

cmd/opinit_bots.go

@@ -513,8 +513,8 @@ func OPInitBotsResetCommand() *cobra.Command {
 			})
 			analytics.TrackRunEvent(cmd, args, analytics.ResetOPinitBotFeature, analytics.NewEmptyEvent())
 			execCmd := exec.Command(binaryPath, "reset-db", botName)
-			if err = execCmd.Run(); err != nil {
-				return fmt.Errorf("failed to reset-db: %v", err)
+			if output, err := execCmd.CombinedOutput(); err != nil {
+				return fmt.Errorf("failed to reset-db: %v (output: %s)", err, string(output))
 			}
 			analytics.TrackCompletedEvent(analytics.ResetOPinitBotFeature)
 			fmt.Printf("Reset the OPinit %s bot database successfully.\n", botName)

cosmosutils/keys.go

@@ -195,8 +195,8 @@ func OPInitGrantOracle(appName, address, opInitHome string) error {
 	var stderr bytes.Buffer
 	cmd.Stderr = &stderr
 
-	if err := cmd.Run(); err != nil {
-		return fmt.Errorf("failed to grant oracle to address %s: %v, stderr: %s", address, err, stderr.String())
+	if output, err := cmd.CombinedOutput(); err != nil {
+		return fmt.Errorf("failed to grant oracle to address %s: %v (output: %s)", address, err, string(output))
 	}
 
 	return nil
@@ -357,8 +357,8 @@ func GetHermesRelayerAddress(appName, chainId string) (string, bool) {
 
 func DeleteWeaveKeyFromHermes(appName, chainId string) error {
 	cmd := exec.Command(appName, "keys", "delete", "--chain", chainId, "--key-name", "weave-relayer")
-	if err := cmd.Run(); err != nil {
-		return fmt.Errorf("failed to delete key from hermes for network: %s: %v", chainId, err)
+	if output, err := cmd.CombinedOutput(); err != nil {
+		return fmt.Errorf("failed to delete key from hermes for network: %s: %v (output: %s)", chainId, err, string(output))
 	}
 
 	return nil

models/initia/run_l1_node.go

@@ -1092,17 +1092,17 @@ func initializeApp(ctx context.Context) tea.Cmd {
 		}
 		if _, err := os.Stat(initiaHome); os.IsNotExist(err) {
 			runCmd := exec.Command(binaryPath, "init", fmt.Sprintf("'%s'", state.moniker), "--chain-id", state.chainId, "--home", initiaHome)
-			if err := runCmd.Run(); err != nil {
-				return ui.NonRetryableErrorLoading{Err: fmt.Errorf("failed to run initiad init: %v", err)}
+			if output, err := runCmd.CombinedOutput(); err != nil {
+				return ui.NonRetryableErrorLoading{Err: fmt.Errorf("failed to run initiad init: %v (output: %s)", err, string(output))}
 			}
 
 		}
 
 		if _, err = os.Stat(filepath.Join(initiaHome, "cosmovisor")); os.IsNotExist(err) {
 			runCmd := exec.Command(cosmovisorPath, "init", binaryPath)
 			runCmd.Env = append(runCmd.Env, "DAEMON_NAME=initiad", "DAEMON_HOME="+initiaHome)
-			if err := runCmd.Run(); err != nil {
-				return ui.NonRetryableErrorLoading{Err: fmt.Errorf("failed to run cosmovisor init: %v", err)}
+			if output, err := runCmd.CombinedOutput(); err != nil {
+				return ui.NonRetryableErrorLoading{Err: fmt.Errorf("failed to run cosmovisor init: %v (output: %s)", err, string(output))}
 			}
 		}
 
@@ -1182,8 +1182,8 @@ func initializeApp(ctx context.Context) tea.Cmd {
 
 			// Initialize the node in the temporary directory
 			initCmd := exec.Command(binaryPath, "init", state.moniker, "--chain-id", state.chainId, "--home", tmpInitiaHome)
-			if err := initCmd.Run(); err != nil {
-				return ui.NonRetryableErrorLoading{Err: fmt.Errorf("failed to run temporary initiad init: %v", err)}
+			if output, err := initCmd.CombinedOutput(); err != nil {
+				return ui.NonRetryableErrorLoading{Err: fmt.Errorf("failed to run temporary initiad init: %v (output: %s)", err, string(output))}
 			}
 
 			// Move the temporary genesis.json file to the user Initia config path
@@ -1859,8 +1859,8 @@ func snapshotExtractor(ctx context.Context) tea.Cmd {
 		}
 		binaryPath := filepath.Join(userHome, common.WeaveDataDirectory, fmt.Sprintf("initia@%s", state.initiadVersion), "initiad")
 		runCmd := exec.Command(binaryPath, "comet", "unsafe-reset-all", "--keep-addr-book", "--home", initiaHome)
-		if err := runCmd.Run(); err != nil {
-			return ui.NonRetryableErrorLoading{Err: fmt.Errorf("failed to run initiad comet unsafe-reset-all: %v", err)}
+		if output, err := runCmd.CombinedOutput(); err != nil {
+			return ui.NonRetryableErrorLoading{Err: fmt.Errorf("failed to run initiad comet unsafe-reset-all: %v (output: %s)", err, string(output))}
 		}
 
 		cmd := exec.Command("bash", "-c", fmt.Sprintf("lz4 -c -d %s | tar -x -C %s", filepath.Join(userHome, common.WeaveDataDirectory, common.SnapshotFilename), initiaHome))
@@ -1973,8 +1973,8 @@ func setupStateSync(ctx context.Context) tea.Cmd {
 			return ui.NonRetryableErrorLoading{Err: fmt.Errorf("[error] Failed to get initia binary path: %v", err)}
 		}
 		runCmd := exec.Command(binaryPath, "comet", "unsafe-reset-all", "--keep-addr-book", "--home", initiaHome)
-		if err := runCmd.Run(); err != nil {
-			return ui.ErrorLoading{Err: fmt.Errorf("failed to run initiad comet unsafe-reset-all: %v", err)}
+		if output, err := runCmd.CombinedOutput(); err != nil {
+			return ui.ErrorLoading{Err: fmt.Errorf("failed to run initiad comet unsafe-reset-all: %v (output: %s)", err, string(output))}
 		}
 
 		return ui.EndLoading{}

models/minitia/launch.go

@@ -3120,8 +3120,8 @@ func (m *LaunchingNewMinitiaLoading) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 				"--from", "Validator", "--keyring-backend", "test",
 				"--chain-id", state.chainId, "-y",
 			)
-			if err := runCmd.Run(); err != nil {
-				return m, m.HandlePanic(fmt.Errorf("failed to update params message: %v", err))
+			if output, err := runCmd.CombinedOutput(); err != nil {
+				return m, m.HandlePanic(fmt.Errorf("failed to update params message: %v (output: %s)", err, string(output)))
 			}
 		}
 

service/launchd.go

@@ -72,8 +72,8 @@ func (j *Launchd) Create(binaryVersion, appHome string) error {
 	cmd := exec.Command("tee", plistPath)
 	template := DarwinTemplateMap[j.commandName]
 	cmd.Stdin = strings.NewReader(fmt.Sprintf(string(template), binaryName, binaryPath, appHome, userHome, weaveLogPath, j.GetCommandName()))
-	if err := cmd.Run(); err != nil {
-		return fmt.Errorf("failed to create service: %v", err)
+	if output, err := cmd.CombinedOutput(); err != nil {
+		return fmt.Errorf("failed to create service: %v (output: %s)", err, string(output))
 	}
 	return j.reloadService()
 }
@@ -102,8 +102,8 @@ func (j *Launchd) reloadService() error {
 	unloadCmd := exec.Command("launchctl", "unload", filepath.Join(userHome, launchdServiceFilePath, fmt.Sprintf("%s.plist", serviceName)))
 	_ = unloadCmd.Run()
 	loadCmd := exec.Command("launchctl", "load", filepath.Join(userHome, launchdServiceFilePath, fmt.Sprintf("%s.plist", serviceName)))
-	if err := loadCmd.Run(); err != nil {
-		return fmt.Errorf("failed to load service: %v", err)
+	if output, err := loadCmd.CombinedOutput(); err != nil {
+		return fmt.Errorf("failed to load service: %v (output: %s)", err, string(output))
 	}
 	return nil
 }

service/systemd.go

@@ -51,9 +51,9 @@ func (j *Systemd) ensureUserServicePrerequisites() error {
 	}
 
 	enableCmd := exec.Command("loginctl", "enable-linger", j.user.Username)
-	if err := enableCmd.Run(); err != nil {
-		return fmt.Errorf("failed to enable lingering. Please run 'loginctl enable-linger %s' manually: %v",
-			j.user.Username, err)
+	if output, err := enableCmd.CombinedOutput(); err != nil {
+		return fmt.Errorf("failed to enable lingering. Please run 'loginctl enable-linger %s' manually: %v (output: %s)",
+			j.user.Username, err, string(output))
 	}
 
 	// Check and set XDG_RUNTIME_DIR if not set
@@ -168,7 +168,12 @@ func (j *Systemd) systemctl(args ...string) error {
 	} else {
 		cmd = exec.Command("systemctl", args...)
 	}
-	return cmd.Run()
+
+	// Capture both stdout and stderr
+	if output, err := cmd.CombinedOutput(); err != nil {
+		return fmt.Errorf("systemctl error: %v, output: %s", err, string(output))
+	}
+	return nil
 }
 
 func (j *Systemd) getServiceDirPath() string {