commit: 44c2ebb24e53bbf8c8848072cbe3b66471f883df Author: Ulrich Müller <ulm <AT> gentoo <DOT> org> AuthorDate: Sat Sep 23 18:38:29 2017 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sat Jul 30 05:46:33 2022 +0000 URL: https://gitweb.gentoo.org/proj/gentoo-functions.git/commit/?id=44c2ebb2
functions.sh: Don't hardcode escape seqences for ENDCOL 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 <ulm <AT> gentoo.org> Signed-off-by: Sam James <sam <AT> gentoo.org> 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
