From: Martin Kelly <mkelly@xevo.com>
Date: Wed, 31 Jan 2018 22:33:12 +0000 (-0800)
Subject: setup_mm_packages.sh: handle weird terminals
X-Git-Tag: 5.99.1~78^2
X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=commitdiff_plain;h=04dd9605fce7cc32ba807a7c07759b90b0d883f0;p=AGL%2Fmeta-agl.git

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 <mkelly@xevo.com>
---

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)