refactor

list.go

@@ -22,7 +22,6 @@ package main
 import (
 	"fmt"
 	"log/slog"
-	"os"
 
 	"github.com/leonelquinteros/gotext"
 	"github.com/urfave/cli/v2"
@@ -77,8 +76,8 @@ func ListCmd() *cli.Command {
 
 			result, err := db.GetPkgs(ctx, where, args...)
 			if err != nil {
-				slog.Error(gotext.Get("Error getting packages"), "err", err)
-				os.Exit(1)
+				slog.Error(gotext.Get("Error getting packages"))
+				return cli.Exit(err, 1)
 			}
 			defer result.Close()
 
@@ -86,14 +85,13 @@ func ListCmd() *cli.Command {
 			if c.Bool("installed") {
 				mgr := manager.Detect()
 				if mgr == nil {
-					slog.Error(gotext.Get("Unable to detect a supported package manager on the system"))
-					os.Exit(1)
+					return cli.Exit(gotext.Get("Unable to detect a supported package manager on the system"), 1)
 				}
 
 				installed, err := mgr.ListInstalled(&manager.Opts{AsRoot: false})
 				if err != nil {
 					slog.Error(gotext.Get("Error listing installed packages"), "err", err)
-					os.Exit(1)
+					return cli.Exit(err, 1)
 				}
 
 				for pkgName, version := range installed {
@@ -110,7 +108,7 @@ func ListCmd() *cli.Command {
 				var pkg database.Package
 				err := result.StructScan(&pkg)
 				if err != nil {
-					return err
+					return cli.Exit(err, 1)
 				}
 
 				if slices.Contains(cfg.IgnorePkgUpdates(), pkg.Name) {
@@ -130,11 +128,6 @@ func ListCmd() *cli.Command {
 				fmt.Printf("%s/%s %s\n", pkg.Repository, pkg.Name, version)
 			}
 
-			if err != nil {
-				slog.Error(gotext.Get("Error iterating over packages"), "err", err)
-				os.Exit(1)
-			}
-
 			return nil
 		},
 	}