[terminal] Improve 'AlwaysYes' flag handling

essentialkaos · Aug 3, 2023 · 52086c7 · 52086c7
1 parent f980a4a
commit 52086c7
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 ## Changelog
 
+### 12.75.1
+
+* `[terminal]` Improved `AlwaysYes` flag handling
+
 ### 12.75.0
 
 * `[terminal]` Added flag `AlwaysYes`, if set `ReadAnswer` will always return true without reading user input (_useful for working with option for forced actions_)

diff --git a/ek.go b/ek.go
@@ -20,7 +20,7 @@ import (
 // ////////////////////////////////////////////////////////////////////////////////// //
 
 // VERSION is current ek package version
-const VERSION = "12.75.0"
+const VERSION = "12.75.1"
 
 // ////////////////////////////////////////////////////////////////////////////////// //
 

diff --git a/terminal/terminal.go b/terminal/terminal.go
@@ -90,16 +90,20 @@ func Read(title string, nonEmpty bool) (string, error) {
 
 // ReadAnswer reads user's answer for yes/no question
 func ReadAnswer(title string, defaultAnswers ...string) (bool, error) {
-	if AlwaysYes {
-		return true, nil
-	}
-
 	var defaultAnswer string
 
 	if len(defaultAnswers) != 0 {
 		defaultAnswer = defaultAnswers[0]
 	}
 
+	if AlwaysYes {
+		if title != "" {
+			fmtc.Println(TitleColorTag + getAnswerTitle(title, defaultAnswer) + "{!}")
+		}
+		fmtc.Println(Prompt + "y")
+		return true, nil
+	}
+
 	for {
 		answer, err := readUserInput(
 			getAnswerTitle(title, defaultAnswer), false, false,