abuild: add msg2(), warning2() and error2()

For a second, indented message line.
This commit is contained in:
Natanael Copa 2012-02-13 07:37:06 +00:00
parent 0a11c5e3c1
commit 2f5545cd61

View File

@ -53,26 +53,42 @@ fi
# functions # functions
msg() { msg() {
[ -n "$quiet" ] && return 0
local prompt="$GREEN>>>${NORMAL}" local prompt="$GREEN>>>${NORMAL}"
local fake="${FAKEROOTKEY:+${BLUE}*${NORMAL}}" local fake="${FAKEROOTKEY:+${BLUE}*${NORMAL}}"
local name="${STRONG}${subpkgname:-$pkgname}${NORMAL}" local name="${STRONG}${subpkgname:-$pkgname}${NORMAL}"
[ -z "$quiet" ] && printf "${prompt} ${name}${fake}: $@\n" >&2 printf "${prompt} ${name}${fake}: %s\n" "$1" >&2
}
msg2() {
[ -n "$quiet" ] && return 0
# ">>> %s"
printf " %s\n" "$1" >&2
} }
warning() { warning() {
local prompt="${YELLOW}>>> WARNING:${NORMAL}" local prompt="${YELLOW}>>> WARNING:${NORMAL}"
local fake="${FAKEROOTKEY:+${BLUE}*${NORMAL}}" local fake="${FAKEROOTKEY:+${BLUE}*${NORMAL}}"
local name="${STRONG}${subpkgname:-$pkgname}${NORMAL}" local name="${STRONG}${subpkgname:-$pkgname}${NORMAL}"
printf "${prompt} ${name}${fake}: $@\n" >&2 printf "${prompt} ${name}${fake}: %s\n" "$1" >&2
}
warning2() {
# ">>> WARNING:
printf " %s\n" "$1" >&2
} }
error() { error() {
local prompt="${RED}>>> ERROR:${NORMAL}" local prompt="${RED}>>> ERROR:${NORMAL}"
local fake="${FAKEROOTKEY:+${BLUE}*${NORMAL}}" local fake="${FAKEROOTKEY:+${BLUE}*${NORMAL}}"
local name="${STRONG}${subpkgname:-$pkgname}${NORMAL}" local name="${STRONG}${subpkgname:-$pkgname}${NORMAL}"
printf "${prompt} ${name}${fake}: $@\n" >&2 printf "${prompt} ${name}${fake}: %s\n" "$1" >&2
} }
error2() {
# ">>> ERROR:
printf " %s\n" "$1" >&2
}
set_xterm_title() { set_xterm_title() {
if [ "$TERM" = xterm ] && [ -n "$USE_COLORS" ]; then if [ "$TERM" = xterm ] && [ -n "$USE_COLORS" ]; then