moritzruth/void-packages
1
0
Fork 0
Code Releases Activity Actions 2

xbps-src: redirect msg_{error,warn}* output to stderr.

Browse source
This commit is contained in:
Juan RP 2011-06-21 15:40:28 +02:00
parent b499ce4afd
commit 8a49fffda2
1 changed files with 10 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

24
xbps-src/shutils/common_funcs.sh
View file

@ -129,13 +129,13 @@ run_func()
msg_red() msg_red()
{ {
# error messages in bold/red # error messages in bold/red
printf "\033[1m\033[31m" printf >&2 "\033[1m\033[31m"
if [ -n "$in_chroot" ]; then if [ -n "$in_chroot" ]; then
printf "[chroot] => ERROR: $@" printf >&2 "[chroot] => ERROR: $@"
else else
printf "=> ERROR: $@" printf >&2 "=> ERROR: $@"
fi fi
printf "\033[m" printf >&2 "\033[m"
} }
msg_error() msg_error()
@ -146,9 +146,7 @@ msg_error()
msg_error_nochroot() msg_error_nochroot()
{ {
printf "\033[1m\033[31m" printf >&2 "\033[1m\033[31m>= ERROR: $@\033[m"
printf "=> ERROR: $@"
printf "\033[m"
exit 1 exit 1
} }
@ -156,20 +154,18 @@ msg_error_nochroot()
msg_warn() msg_warn()
{ {
# warn messages in bold/yellow # warn messages in bold/yellow
printf "\033[1m\033[33m" printf >&2 "\033[1m\033[33m"
if [ -n "$in_chroot" ]; then if [ -n "$in_chroot" ]; then
printf "[chroot] => WARNING: $@" printf >&2 "[chroot] => WARNING: $@"
else else
printf "=> WARNING: $@" printf >&2 "=> WARNING: $@"
fi fi
printf "\033[m" printf >&2 "\033[m"
} }
msg_warn_nochroot() msg_warn_nochroot()
{ {
printf "\033[1m\033[33m" printf >&2 "\033[1m\033[33m=> WARNING: $@\033[m"
printf "=> WARNING: $@"
printf "\033[m"
} }
msg_normal() msg_normal()