From 8513d8cd02a61a80241aaf08c6032f92890b967f Mon Sep 17 00:00:00 2001 From: walkerning Date: Sun, 1 May 2016 01:06:29 +0800 Subject: [PATCH] Check if stdout is a terminal in lxc-checkconfig Let lxc-checkconfig write to non-tty stdout without color control characters Signed-off-by: walkerning --- src/lxc/lxc-checkconfig.in | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/src/lxc/lxc-checkconfig.in b/src/lxc/lxc-checkconfig.in index 835202b259..29586f869b 100644 --- a/src/lxc/lxc-checkconfig.in +++ b/src/lxc/lxc-checkconfig.in @@ -6,10 +6,17 @@ CAT="cat" -SETCOLOR_SUCCESS="printf \\033[1;32m" -SETCOLOR_FAILURE="printf \\033[1;31m" -SETCOLOR_WARNING="printf \\033[1;33m" -SETCOLOR_NORMAL="printf \\033[0;39m" +if [ -t 1 ]; then + SETCOLOR_SUCCESS="printf \\033[1;32m" + SETCOLOR_FAILURE="printf \\033[1;31m" + SETCOLOR_WARNING="printf \\033[1;33m" + SETCOLOR_NORMAL="printf \\033[0;39m" +else + SETCOLOR_SUCCESS=":" + SETCOLOR_FAILURE=":" + SETCOLOR_WARNING=":" + SETCOLOR_NORMAL=":" +fi is_set() { $CAT $CONFIG | grep "$1=[y|m]" > /dev/null