summaryrefslogtreecommitdiff
path: root/functions/defaults.sh
diff options
context:
space:
mode:
authorLyndon Brown <jnqnfe@gmail.com>2020-03-13 18:36:26 +0000
committerRaphaƫl Hertzog <hertzog@debian.org>2020-03-16 13:32:16 +0000
commitca520eb5f0556094338e0c841dcaa970d9a28886 (patch)
tree10ebfc87bda84f81e7a4c285054d607b651d28ab /functions/defaults.sh
parent09b279b7bc02c5aeec3fc5e75732b338f92a3921 (diff)
downloadvyos-live-build-ca520eb5f0556094338e0c841dcaa970d9a28886.tar.gz
vyos-live-build-ca520eb5f0556094338e0c841dcaa970d9a28886.zip
split stdout & stderr auto colouring
thus for some reason if one is connected to a tty and the other a file, we still get colour in the tty by default. in terms of options, --color and --no-color override both, no granular ones added since it's not worth it imo. this is backwards compatible with custom configs setting `_COLOR`. it could be argued that setting $_COLOR to "false" for the auto non-tty cases is redundant, which it is, but it doesn't hurt to do so; it ensures that if anything (inc. 3rd-party hooks and such) rely on it that it remains correct; and ensures that if anything in the future mistakenly uses $_COLOR instead of $_COLOR_OUT|$_COLOR_ERR that at least that will only be broken for the use case of only one of stdout|sdterr being a tty. Gbp-Dch: Ignore
Diffstat (limited to 'functions/defaults.sh')
-rwxr-xr-xfunctions/defaults.sh15
1 files changed, 12 insertions, 3 deletions
diff --git a/functions/defaults.sh b/functions/defaults.sh
index 108a9d96e..786a9dc4c 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -296,10 +296,19 @@ Set_config_defaults ()
esac
# Setting live build options
- if [ -t 1 ] && [ -t 2 ]; then
- _COLOR="${_COLOR:-true}"
+ if [ -z "${_COLOR}" ]; then
+ _COLOR="auto"
+ _COLOR_OUT="true"
+ _COLOR_ERR="true"
+ if [ ! -t 1 ]; then
+ _COLOR_OUT="false"
+ fi
+ if [ ! -t 2 ]; then
+ _COLOR_ERR="false"
+ fi
else
- _COLOR="${_COLOR:-false}"
+ _COLOR_OUT="${_COLOR}"
+ _COLOR_ERR="${_COLOR}"
fi
_BREAKPOINTS="${_BREAKPOINTS:-false}"
_DEBUG="${_DEBUG:-false}"