[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     3938405f01a57d3946b4cabdbc363338ec7f67cc
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 20 21:02:28 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Jul 21 15:47:50 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=3938405f

gen_funcs.sh: set_color_vars(): Define NORMAL as last color

This will fix output when running with "set -x" very early.

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_funcs.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/gen_funcs.sh b/gen_funcs.sh
index 67b5d21..5681d0d 100755
--- a/gen_funcs.sh
+++ b/gen_funcs.sh
@@ -25,19 +25,19 @@ isTrue() {
 set_color_vars() {
        if ! isTrue "${NOCOLOR}"
        then
+               BOLD=$'\e[0;01m'
+               UNDER=$'\e[4m'
                GOOD=$'\e[32;01m'
                WARN=$'\e[33;01m'
                BAD=$'\e[31;01m'
                NORMAL=$'\e[0m'
-               BOLD=$'\e[0;01m'
-               UNDER=$'\e[4m'
        else
+               BOLD=''
+               UNDER=''
                GOOD=''
                WARN=''
                BAD=''
                NORMAL=''
-               BOLD=''
-               UNDER=''
        fi
 }
 set_color_vars