# HG changeset patch
# User Aleksej Bobylev <al.bobylev@gmail.com>
# Date 1469169434 -10800
# Node ID 1dd292a4b72bbdab64af165696a59d9aa9182e6b
# Parent  05b76c5655d00bccd5a50190902a6d0252c604e2
libtaz.sh: confirm(): handle '--noconfirm'.

diff -r 05b76c5655d0 -r 1dd292a4b72b rootfs/lib/libtaz.sh
--- a/rootfs/lib/libtaz.sh	Sun May 29 13:11:28 2016 +0300
+++ b/rootfs/lib/libtaz.sh	Fri Jul 22 09:37:14 2016 +0300
@@ -157,17 +157,24 @@
 
 # Confirmation
 confirm() {
-	if [ -n "$yes" ]; then
-		true
+	local answer=''
+	# Check auto-answer, if any
+	[ -n "$yes" ] && answer='y'
+	[ -n "$noconfirm" ] && answer='n'
+	# Print question
+	if [ -n "$1" ]; then
+		echo -n "$1 "
 	else
-		if [ -n "$1" ]; then
-			echo -n "$1 "
-		else
-			echo -n " ($(translate_query y)/$(translate_query N)) ? "
-		fi
+		echo -n " ($(translate_query y)/$(translate_query N)) ? "
+	fi
+	# Is it auto-answer?
+	if [ -z "$answer" ]; then
 		read answer
-		[ "$answer" == "$(translate_query y)" ]
+	else
+		translate_query "$answer"; echo ' (auto)'
 	fi
+	# Return true/false to use in conditions
+	[ "$answer" == "$(translate_query y)" ]
 }
 
 # Log activities