commit: 7b4d2dbba7937c7576631ffeb3538f81ca9e02f7
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 28 01:01:15 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jul 29 02:03:18 2022 +0000
URL:
https://gitweb.gentoo.org/proj/gentoo-functions.git/commit/?id=7b4d2dbb
functions.sh: sort color definition ordering
Makes it easier to compare with Portage's isolated-functions.sh.
Signed-off-by: Sam James <sam <AT> gentoo.org>
functions.sh | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/functions.sh b/functions.sh
index be67536..0b9e9cf 100644
--- a/functions.sh
+++ b/functions.sh
@@ -437,21 +437,21 @@ fi
# Setup the colors so our messages all look pretty
if yesno "${RC_NOCOLOR}"; then
- unset GOOD WARN BAD NORMAL HILITE BRACKET
+ unset BAD BRACKET GOOD HILITE NORMAL WARN
elif (command -v tput && tput colors) >/dev/null 2>&1; then
- GOOD="$(tput sgr0)$(tput bold)$(tput setaf 2)"
- WARN="$(tput sgr0)$(tput bold)$(tput setaf 3)"
BAD="$(tput sgr0)$(tput bold)$(tput setaf 1)"
- HILITE="$(tput sgr0)$(tput bold)$(tput setaf 6)"
BRACKET="$(tput sgr0)$(tput bold)$(tput setaf 4)"
+ GOOD="$(tput sgr0)$(tput bold)$(tput setaf 2)"
+ HILITE="$(tput sgr0)$(tput bold)$(tput setaf 6)"
NORMAL="$(tput sgr0)"
+ WARN="$(tput sgr0)$(tput bold)$(tput setaf 3)"
else
- GOOD=$(printf '\033[32;01m')
- WARN=$(printf '\033[33;01m')
BAD=$(printf '\033[31;01m')
- HILITE=$(printf '\033[36;01m')
BRACKET=$(printf '\033[34;01m')
+ GOOD=$(printf '\033[32;01m')
+ HILITE=$(printf '\033[36;01m')
NORMAL=$(printf '\033[0m')
+ WARN=$(printf '\033[33;01m')
fi
# If we made it this far, the script succeeded, so don't let failures
