Merge pull request #2066 from onflow/cf/fix-exit

Fix: respect termination in `flow init` prompt

Author: chasefleming

internal/dependencymanager/dependencyinstaller.go

@@ -492,7 +492,11 @@ func (di *DependencyInstaller) handleFoundContract(networkName, contractAddr, co
 	// If no hash, ignore
 	if dependency != nil && dependency.Hash != "" && dependency.Hash != originalContractDataHash {
 		msg := fmt.Sprintf("The latest version of %s is different from the one you have locally. Do you want to update it?", contractName)
-		if !prompt.GenericBoolPrompt(msg) {
+		shouldUpdate, err := prompt.GenericBoolPrompt(msg)
+		if err != nil {
+			return err
+		}
+		if !shouldUpdate {
 			return nil
 		}
 	}

internal/prompt/prompt.go

@@ -674,10 +674,13 @@ func InstallPathPrompt(defaultPath string) string {
 	return filepath.Clean(install)
 }
 
-func GenericBoolPrompt(msg string) bool {
-	result, _ := RunSingleSelect([]string{"Yes", "No"}, msg)
+func GenericBoolPrompt(msg string) (bool, error) {
+	result, err := RunSingleSelect([]string{"Yes", "No"}, msg)
+	if err != nil {
+		return false, err
+	}
 
-	return result == "Yes"
+	return result == "Yes", nil
 }
 
 func GenericSelect(items []string, message string) string {

internal/super/init.go

@@ -258,7 +258,11 @@ func startInteractiveInit(
 	}
 
 	msg := "Would you like to install any standard Flow contracts and their dependencies?"
-	if prompt.GenericBoolPrompt(msg) {
+	installContracts, err := prompt.GenericBoolPrompt(msg)
+	if err != nil {
+		return "", err
+	}
+	if installContracts {
 		err := dependencymanager.PromptInstallCoreContracts(logger, state, tempDir, nil)
 		if err != nil {
 			return "", err