summaryrefslogtreecommitdiffstats
path: root/meta-agl-bsp
diff options
context:
space:
mode:
authorMartin Kelly <mkelly@xevo.com>2018-01-31 14:33:12 -0800
committerMartin Kelly <mkelly@xevo.com>2018-03-26 17:10:12 -0700
commitf23b3455217ac34ec4cb5c272e4e6a3626396b68 (patch)
treed37928ca64ee8b79a3a6ae8f59bc3ffda31868c1 /meta-agl-bsp
parent7554f781c90a2fb4c0f50c44f7a3e09c2b262f56 (diff)
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>
Diffstat (limited to 'meta-agl-bsp')
-rw-r--r--meta-agl-bsp/meta-rcar-gen3/scripts/setup_mm_packages.sh10
1 files changed, 7 insertions, 3 deletions
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 242c0f0d5..16613bf8c 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)