abuild: add support for optional remote logging
via ABUILD_LOG_CMD config option This is supposed to be used on the build servers
This commit is contained in:
parent
074f43536d
commit
8b3ecdf1f4
13
abuild.in
13
abuild.in
|
@ -5,7 +5,7 @@
|
||||||
#
|
#
|
||||||
# Distributed under GPL-2
|
# Distributed under GPL-2
|
||||||
#
|
#
|
||||||
# Depends on: busybox utilities, fakeroot,
|
# Depends on: busybox utilities, fakeroot
|
||||||
#
|
#
|
||||||
|
|
||||||
abuild_ver=@VERSION@
|
abuild_ver=@VERSION@
|
||||||
|
@ -52,8 +52,13 @@ monochrome() {
|
||||||
#colors
|
#colors
|
||||||
if [ -n "$USE_COLORS" ]; then
|
if [ -n "$USE_COLORS" ]; then
|
||||||
default_colors
|
default_colors
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# run optional log command for remote logging
|
||||||
|
logcmd() {
|
||||||
|
${ABUILD_LOG_CMD:-true} "$@"
|
||||||
|
return 0
|
||||||
|
}
|
||||||
|
|
||||||
# functions
|
# functions
|
||||||
msg() {
|
msg() {
|
||||||
|
@ -87,6 +92,7 @@ error() {
|
||||||
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}: %s\n" "$1" >&2
|
printf "${prompt} ${name}${fake}: %s\n" "$1" >&2
|
||||||
|
logcmd "ERROR: $pkgname: $1"
|
||||||
}
|
}
|
||||||
|
|
||||||
error2() {
|
error2() {
|
||||||
|
@ -1161,6 +1167,7 @@ mklinks_abuildrepo() {
|
||||||
build_abuildrepo() {
|
build_abuildrepo() {
|
||||||
local d apk
|
local d apk
|
||||||
if ! apk_up2date || [ -n "$force" ]; then
|
if ! apk_up2date || [ -n "$force" ]; then
|
||||||
|
logcmd "building $pkgname"
|
||||||
sanitycheck && builddeps && clean && fetch && unpack \
|
sanitycheck && builddeps && clean && fetch && unpack \
|
||||||
&& prepare && mkusers && rootpkg || return 1
|
&& prepare && mkusers && rootpkg || return 1
|
||||||
fi
|
fi
|
||||||
|
|
Loading…
Reference in New Issue