[patch] functions.sh: Don't hardcode escape seqences for ENDCOL

0001-functions.sh-Don-t-hardcode-escape-seqences-for-ENDC.patch (text/plain), 1.21 KB, created by Ulrich Müller on 2022-07-30 05:45:21 UTC

From 4bc03d65c0a7a40e95319dda59a8de446d060e23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ulrich=20M=C3=BCller?= <[e-mail]>
Date: Sat, 23 Sep 2017 20:38:29 +0200
Subject: [PATCH] functions.sh: Don't hardcode escape seqences for ENDCOL
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Similar to handling of colors, this should make use of tput,
rather than sending unknown escape sequences to dumb terminals.

Bug: https://bugs.gentoo.org/631870
Signed-off-by: Ulrich Müller <[e-mail]>
---
 functions.sh | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/functions.sh b/functions.sh
index a5f3bfd..acce989 100644
--- a/functions.sh
+++ b/functions.sh
@@ -429,10 +429,12 @@ COLS="${COLUMNS:-0}"            # bash's internal COLUMNS variable
 [ -z "${COLS}" ] && COLS=80
 [ "${COLS}" -gt 0 ] || COLS=80	# width of [ ok ] == 7
 
-if yesno "${RC_ENDCOL}"; then
-	ENDCOL='\033[A\033['$(( COLS - 8 ))'C'
-else
+if ! yesno "${RC_ENDCOL}"; then
 	ENDCOL=''
+elif command -v tput >/dev/null 2>&1; then
+	ENDCOL="$(tput cuu1)$(tput cuf $(( COLS - 8 )) )"
+else
+	ENDCOL='\033[A\033['$(( COLS - 8 ))'C'
 fi
 
 # Setup the colors so our messages all look pretty
-- 
2.35.1