From 4e71a5c35cca430d4dc9069d2996110fdd6ce98c Mon Sep 17 00:00:00 2001 From: Arsen Musayelyan Date: Wed, 30 Nov 2022 21:58:21 -0800 Subject: [PATCH] Create function for asking yes or no questions --- build.go | 18 ++++++------------ cli.go | 12 ++++++++++++ 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/build.go b/build.go index 0981614..a83831f 100644 --- a/build.go +++ b/build.go @@ -174,14 +174,11 @@ func buildPackage(ctx context.Context, script string, mgr manager.Manager) ([]st } if !archMatches(vars.Architectures) { - var buildAnyway bool - survey.AskOne( - &survey.Confirm{ - Message: "Your system's CPU architecture doesn't match this package. Do you want to build anyway?", - Default: true, - }, - &buildAnyway, - ) + buildAnyway, err := yesNoPrompt("Your system's CPU architecture doesn't match this package. Do you want to build anyway?", true) + if err != nil { + return nil, nil, err + } + if !buildAnyway { os.Exit(1) } @@ -455,10 +452,7 @@ func buildPackage(ctx context.Context, script string, mgr manager.Manager) ([]st } if len(buildDeps) > 0 { - var removeBuildDeps bool - err = survey.AskOne(&survey.Confirm{ - Message: "Would you like to remove build dependencies?", - }, &removeBuildDeps) + removeBuildDeps, err := yesNoPrompt("Would you like to remove build dependencies?", false) if err != nil { return nil, nil, err } diff --git a/cli.go b/cli.go index 982b074..07b3f48 100644 --- a/cli.go +++ b/cli.go @@ -29,3 +29,15 @@ func pkgPrompt(options []db.Package, verb string) ([]db.Package, error) { return out, nil } + +func yesNoPrompt(msg string, def bool) (bool, error) { + var answer bool + err := survey.AskOne( + &survey.Confirm{ + Message: msg, + Default: def, + }, + &answer, + ) + return answer, err +}