main.go: print ExitError before exiting

Fix issue 4167

Signed-off-by: Akihiro Suda <[email protected]>

Author: AkihiroSuda

cmd/limactl/main.go

@@ -48,11 +48,11 @@ func main() {
 		}
 	}
 	err := newApp().Execute()
-	server.StopAllExternalDrivers()
-	osutil.HandleExitError(err)
 	if err != nil {
-		logrus.Fatal(err)
+		logrus.StandardLogger().Log(logrus.FatalLevel, err)
 	}
+	server.StopAllExternalDrivers()
+	os.Exit(osutil.HandleExitError(err))
 }
 
 func processGlobalFlags(rootCmd *cobra.Command) error {

cmd/yq/yq.go

@@ -13,6 +13,9 @@ import (
 	"strings"
 
 	command "github.com/mikefarah/yq/v4/cmd"
+	"github.com/sirupsen/logrus"
+
+	"github.com/lima-vm/lima/v2/pkg/osutil"
 )
 
 func main() {
@@ -24,11 +27,11 @@ func main() {
 		newArgs := []string{"eval"}
 		cmd.SetArgs(append(newArgs, os.Args[1:]...))
 	}
-	code := 0
-	if err := cmd.Execute(); err != nil {
-		code = 1
+	err = cmd.Execute()
+	if err != nil {
+		logrus.StandardLogger().Log(logrus.FatalLevel, err)
 	}
-	os.Exit(code)
+	os.Exit(osutil.HandleExitError(err))
 }
 
 // MaybeRunYQ runs as `yq` if the program name or first argument is `yq`.

pkg/osutil/exit.go

@@ -5,18 +5,17 @@ package osutil
 
 import (
 	"errors"
-	"os"
 	"os/exec"
 )
 
-func HandleExitError(err error) {
+func HandleExitError(err error) int {
 	if err == nil {
-		return
+		return 0
 	}
 
 	var exitErr *exec.ExitError
 	if errors.As(err, &exitErr) {
-		os.Exit(exitErr.ExitCode()) //nolint:revive // it's intentional to call os.Exit in this function
-		return
+		return exitErr.ExitCode()
 	}
+	return 1
 }

pkg/plugins/plugins.go

@@ -160,11 +160,10 @@ func (plugin *Plugin) Run(ctx context.Context, args []string) {
 	cmd.Env = os.Environ()
 
 	err := cmd.Run()
-	osutil.HandleExitError(err)
-	if err == nil {
-		os.Exit(0) //nolint:revive // it's intentional to call os.Exit in this function
+	if err != nil {
+		logrus.StandardLogger().WithError(err).Logf(logrus.FatalLevel, "external command %q failed", plugin.Path)
 	}
-	logrus.Fatalf("external command %q failed: %v", plugin.Path, err)
+	os.Exit(osutil.HandleExitError(err)) //nolint:revive // it's intentional to call os.Exit in this function
 }
 
 var descRegex = regexp.MustCompile(`<limactl-desc>(.*?)</limactl-desc>`)