diff --git a/abuild b/abuild index 4a17b73..4bac915 100755 --- a/abuild +++ b/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