refactor(update): use better error handling + disable disableTUI sh…

…ortcut flag
AzraelSec · Dec 7, 2023 · 2edc776 · 2edc776
1 parent 5750cf5
commit 2edc776
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/cmd/cli/commands/update/cli.go b/cmd/cli/commands/update/cli.go
@@ -27,7 +27,7 @@ func newCli(repos []config.LiveRepo, output bool) *cli {
 	ctx, cancelCtx := signal.NotifyContext(context.Background(), os.Interrupt, os.Kill)
 
 	updateFn, updateArgs := runnerArgs(ctx, repos, output)
-	return &cli{ctx, cancelCtx,  repos, updateFn, updateArgs, output}
+	return &cli{ctx, cancelCtx, repos, updateFn, updateArgs, output}
 }
 
 func (c *cli) run() {

diff --git a/cmd/cli/commands/update/tui.go b/cmd/cli/commands/update/tui.go
@@ -46,16 +46,17 @@ func (t *tui) initModel() *model {
 	}
 }
 
-func (t *tui) run() {
+func (t *tui) run() error {
 	m, err := tea.NewProgram(t.initModel()).Run()
 	if err != nil {
-		panic(err)
+		return err
 	}
 
 	tm := m.(*model)
 	if tm.status == ABORTED {
 		fmt.Println(ui.RED.Render("Update aborted!"))
 	}
+	return nil
 }
 
 type task struct {

diff --git a/cmd/cli/commands/update/update.go b/cmd/cli/commands/update/update.go
@@ -124,15 +124,15 @@ func (u *update) Command() *cobra.Command {
 			if *disableTui {
 				newCli(u.cm.Repos, *output).run()
 			} else {
-				newTui(u.cm.Repos).run()
+				return newTui(u.cm.Repos).run()
 			}
 
 			return nil
 		},
 	}
 
 	output = cmd.Flags().BoolP("output", "o", false, "Print the updaters output on stdout (mostly debugging purposes)")
-	disableTui = cmd.Flags().BoolP("disableTui", "c", false, "Disable TUI")
+	disableTui = cmd.Flags().Bool("disableTui", false, "Disable TUI")
 
 	return cmd
 }