Improve the readability of klp-build output by implementing a basic
color scheme.  When the standard output and error are connected to a
terminal, highlight status messages in bold and warning/error prefixes
in yellow/red.

Acked-by: Song Liu <[email protected]>
Signed-off-by: Joe Lawrence <[email protected]>
---
 scripts/livepatch/klp-build | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/scripts/livepatch/klp-build b/scripts/livepatch/klp-build
index cf36555330b3..325dc4601bba 100755
--- a/scripts/livepatch/klp-build
+++ b/scripts/livepatch/klp-build
@@ -52,6 +52,15 @@ PATCH_TMP_DIR="$TMP_DIR/tmp"
 
 KLP_DIFF_LOG="$DIFF_DIR/diff.log"
 
+# Terminal output colors
+read -r COLOR_RESET COLOR_BOLD COLOR_ERROR COLOR_WARN <<< ""
+if [[ -t 1 && -t 2 ]]; then
+       COLOR_RESET="\033[0m"
+       COLOR_BOLD="\033[1m"
+       COLOR_ERROR="\033[0;31m"
+       COLOR_WARN="\033[0;33m"
+fi
+
 grep0() {
        # shellcheck disable=SC2317
        command grep "$@" || true
@@ -65,15 +74,15 @@ grep() {
 }
 
 status() {
-       echo "$*"
+       echo -e "${COLOR_BOLD}$*${COLOR_RESET}"
 }
 
 warn() {
-       echo "error: $SCRIPT: $*" >&2
+       echo -e "${COLOR_WARN}warning${COLOR_RESET}: $SCRIPT: $*" >&2
 }
 
 die() {
-       warn "$@"
+       echo -e "${COLOR_ERROR}error${COLOR_RESET}: $SCRIPT: $*" >&2
        exit 1
 }
 
@@ -110,7 +119,7 @@ cleanup() {
 }
 
 trap_err() {
-       warn "line ${BASH_LINENO[0]}: '$BASH_COMMAND'"
+       die "line ${BASH_LINENO[0]}: '$BASH_COMMAND'"
 }
 
 trap cleanup  EXIT INT TERM HUP
-- 
2.53.0


Reply via email to