mirror of
https://gitlab.alpinelinux.org/alpine/abuild.git
synced 2024-12-23 23:42:35 +00:00
use msg for messages
This commit is contained in:
parent
91465846cc
commit
75b479777f
10
abuild
10
abuild
@ -27,10 +27,10 @@ default_cmds="checkdeps clean fetch checkmd5 unpack rootpkg"
|
||||
all_cmds="checksum fetch unpack rootpkg build package cleancache clean srcpkg"
|
||||
|
||||
# functions
|
||||
vecho() {
|
||||
msg() {
|
||||
local sub=
|
||||
[ -n "$INSUB" ] && sub="(sub)"
|
||||
[ -z "$quiet" ] && echo ">>> $pkgname:" "$@" $sub >&2
|
||||
[ -z "$quiet" ] && echo ">>> $pkgname $sub:" "$@" >&2
|
||||
}
|
||||
|
||||
warning() {
|
||||
@ -39,7 +39,7 @@ warning() {
|
||||
|
||||
die() {
|
||||
quiet=
|
||||
vecho "$@" >&2
|
||||
msg "$@" >&2
|
||||
exit 1
|
||||
}
|
||||
|
||||
@ -139,7 +139,7 @@ cleanpkg() {
|
||||
|
||||
runpart() {
|
||||
local part=$1
|
||||
vecho "$part"
|
||||
msg "$part"
|
||||
$part || die "$part failed"
|
||||
}
|
||||
|
||||
@ -318,7 +318,7 @@ trap 'die "Aborted by user"' INT
|
||||
|
||||
if [ -z "$1" ]; then
|
||||
if up2date && [ -z "$force" ]; then
|
||||
vecho "Package is up to date"
|
||||
msg "Package is up to date"
|
||||
else
|
||||
set $default_cmds
|
||||
fi
|
||||
|
Loading…
Reference in New Issue
Block a user