diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2018-02-20 08:20:20 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2018-02-22 08:28:46 +0100 |
| commit | 7e879bd678fa1ac8b1b0bd4e7b9c845b0e967da2 (patch) | |
| tree | 6a7004cc79bda34e3e46bcb53292247d13849913 /defaultenv | |
| parent | e18cc5b7e9ce0ac71f0e00f166ca2e2afcc3f466 (diff) | |
| download | barebox-7e879bd678fa1ac8b1b0bd4e7b9c845b0e967da2.tar.gz barebox-7e879bd678fa1ac8b1b0bd4e7b9c845b0e967da2.tar.xz | |
console: move global.allow_color handling to C code
We have global.allow_color, but this is limited to the environment
only. Move creation and handling of this variable to C code so that
we can add support for colored output to commands/console controlled
by the same variable.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'defaultenv')
| -rw-r--r-- | defaultenv/defaultenv-2-base/bin/init | 3 | ||||
| -rw-r--r-- | defaultenv/defaultenv-2-base/data/ansi-colors | 2 | ||||
| -rw-r--r-- | defaultenv/defaultenv-2-base/init/ps1 | 2 |
3 files changed, 2 insertions, 5 deletions
diff --git a/defaultenv/defaultenv-2-base/bin/init b/defaultenv/defaultenv-2-base/bin/init index 7af3c7d95c..6f3a34dbac 100644 --- a/defaultenv/defaultenv-2-base/bin/init +++ b/defaultenv/defaultenv-2-base/bin/init @@ -6,7 +6,6 @@ global hostname global user global autoboot_timeout global boot.default -global allow_color global linux.bootargs.base global linux.bootargs.console #linux.bootargs.dyn.* will be cleared at the beginning of boot @@ -20,8 +19,6 @@ magicvar -a global.user "username (used in network filenames)" [ -z "${global.autoboot_timeout}" ] && global.autoboot_timeout=3 magicvar -a global.autoboot_timeout "timeout in seconds before automatic booting" [ -z "${global.boot.default}" ] && global.boot.default=net -[ -z "${global.allow_color}" ] && global.allow_color=true -magicvar -a global.allow_color "Allow color on the console (boolean)" [ -z "${global.editcmd}" ] && global.editcmd=sedit [ -e /env/config-board ] && /env/config-board diff --git a/defaultenv/defaultenv-2-base/data/ansi-colors b/defaultenv/defaultenv-2-base/data/ansi-colors index 636532979a..c61cae24e8 100644 --- a/defaultenv/defaultenv-2-base/data/ansi-colors +++ b/defaultenv/defaultenv-2-base/data/ansi-colors @@ -1,6 +1,6 @@ #!/bin/sh -if [ ${global.allow_color} != "true" ]; then +if [ ${global.allow_color} != "1" ]; then exit fi diff --git a/defaultenv/defaultenv-2-base/init/ps1 b/defaultenv/defaultenv-2-base/init/ps1 index 02d7b4b780..bbb544338c 100644 --- a/defaultenv/defaultenv-2-base/init/ps1 +++ b/defaultenv/defaultenv-2-base/init/ps1 @@ -1,6 +1,6 @@ #!/bin/sh -if [ ${global.allow_color} = "true" ]; then +if [ ${global.allow_color} = "1" ]; then export PS1="\e[1;32mbarebox@\e[1;36m\h:\w\e[0m " else export PS1="barebox@\h:\w " |