Use ANSI 'foreground' color instead of hardcoding 'white'

Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
This commit is contained in:
Aaron Griffin 2007-09-27 23:38:51 -05:00
parent b86479cf9b
commit 48bf088e65

View file

@ -67,7 +67,7 @@ PACMAN_OPTS=
plain() { plain() {
local mesg=$1; shift local mesg=$1; shift
if [ -t 2 -a ! "$USE_COLOR" = "n" -a "$(check_buildenv color)" = "y" ]; then if [ -t 2 -a ! "$USE_COLOR" = "n" -a "$(check_buildenv color)" = "y" ]; then
printf "\033[1;37m ${mesg}\033[0m\n" "$@" >&2 printf "\033[1;1m ${mesg}\033[0m\n" "$@" >&2
else else
printf " ${mesg}\n" "$@" >&2 printf " ${mesg}\n" "$@" >&2
fi fi
@ -76,7 +76,7 @@ plain() {
msg() { msg() {
local mesg=$1; shift local mesg=$1; shift
if [ -t 2 -a ! "$USE_COLOR" = "n" -a "$(check_buildenv color)" = "y" ]; then if [ -t 2 -a ! "$USE_COLOR" = "n" -a "$(check_buildenv color)" = "y" ]; then
printf "\033[1;32m==>\033[1;37m ${mesg}\033[0m\n" "$@" >&2 printf "\033[1;32m==>\033[1;1m ${mesg}\033[0m\n" "$@" >&2
else else
printf "==> ${mesg}\n" "$@" >&2 printf "==> ${mesg}\n" "$@" >&2
fi fi
@ -85,7 +85,7 @@ msg() {
msg2() { msg2() {
local mesg=$1; shift local mesg=$1; shift
if [ -t 2 -a ! "$USE_COLOR" = "n" -a "$(check_buildenv color)" = "y" ]; then if [ -t 2 -a ! "$USE_COLOR" = "n" -a "$(check_buildenv color)" = "y" ]; then
printf "\033[1;34m ->\033[1;37m ${mesg}\033[0m\n" "$@" >&2 printf "\033[1;34m ->\033[1;1m ${mesg}\033[0m\n" "$@" >&2
else else
printf " -> ${mesg}\n" "$@" >&2 printf " -> ${mesg}\n" "$@" >&2
fi fi
@ -94,7 +94,7 @@ msg2() {
warning() { warning() {
local mesg=$1; shift local mesg=$1; shift
if [ -t 2 -a ! "$USE_COLOR" = "n" -a "$(check_buildenv color)" = "y" ]; then if [ -t 2 -a ! "$USE_COLOR" = "n" -a "$(check_buildenv color)" = "y" ]; then
printf "\033[1;33m==> $(gettext "WARNING:")\033[1;37m ${mesg}\033[0m\n" "$@" >&2 printf "\033[1;33m==> $(gettext "WARNING:")\033[1;1m ${mesg}\033[0m\n" "$@" >&2
else else
printf "==> $(gettext "WARNING:") ${mesg}\n" "$@" >&2 printf "==> $(gettext "WARNING:") ${mesg}\n" "$@" >&2
fi fi
@ -103,7 +103,7 @@ warning() {
error() { error() {
local mesg=$1; shift local mesg=$1; shift
if [ -t 2 -a ! "$USE_COLOR" = "n" -a "$(check_buildenv color)" = "y" ]; then if [ -t 2 -a ! "$USE_COLOR" = "n" -a "$(check_buildenv color)" = "y" ]; then
printf "\033[1;31m==> $(gettext "ERROR:")\033[1;37m ${mesg}\033[0m\n" "$@" >&2 printf "\033[1;31m==> $(gettext "ERROR:")\033[1;1m ${mesg}\033[0m\n" "$@" >&2
else else
printf "==> $(gettext "ERROR:") ${mesg}\n" "$@" >&2 printf "==> $(gettext "ERROR:") ${mesg}\n" "$@" >&2
fi fi