From 04dd9605fce7cc32ba807a7c07759b90b0d883f0 Mon Sep 17 00:00:00 2001 From: Martin Kelly Date: Wed, 31 Jan 2018 14:33:12 -0800 Subject: setup_mm_packages.sh: handle weird terminals Currently, setup_mm_packages.sh fails on terminals that won't display colors (such as my Jenkins CI setup). Tweak the code to handle this case and display an error message instead of failing. Change-Id: If18e16ed385af567801a56871542b4eb86f4588d Signed-off-by: Martin Kelly --- meta-agl-bsp/meta-rcar-gen3/scripts/setup_mm_packages.sh | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'meta-agl-bsp/meta-rcar-gen3') diff --git a/meta-agl-bsp/meta-rcar-gen3/scripts/setup_mm_packages.sh b/meta-agl-bsp/meta-rcar-gen3/scripts/setup_mm_packages.sh index dddb3379c..587569f9e 100644 --- a/meta-agl-bsp/meta-rcar-gen3/scripts/setup_mm_packages.sh +++ b/meta-agl-bsp/meta-rcar-gen3/scripts/setup_mm_packages.sh @@ -15,10 +15,14 @@ function color { [[ $stdout_in_terminal == 0 ]] && return for k in $*; do case $k in - bold) tput bold 2>/dev/null;; - none) tput sgr0 2>/dev/null;; - *) tput setaf $k 2>/dev/null;; + bold) tput bold;; + none) tput sgr0;; + *) tput setaf $k;; esac + if [[ $? != 0 ]]; then + echo "tput: terminal doesn't support color settings, continuing" >&2 + true + fi done } color_green=$(color bold 2) -- cgit 1.2.3-korg