From 044359f0ade2460cfc1498a4633e9de5c807eef7 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Mon, 26 Jan 2009 13:32:44 +0000 Subject: abuild: style fixes --- abuild | 2 +- functions.sh | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/abuild b/abuild index 9370d51..687a253 100755 --- a/abuild +++ b/abuild @@ -164,7 +164,7 @@ unpack() { msg "Unpacking $s..." unzip "$s" -d "$srcdir" || return 1;; *) - error "Archive not supported" + error "${s##*/}: Archive not supported" return 1;; esac done diff --git a/functions.sh b/functions.sh index 6dde80c..032a7e6 100644 --- a/functions.sh +++ b/functions.sh @@ -13,22 +13,22 @@ fi # functions msg() { local prompt="$GREEN>>>${NORMAL}" - local fake="${FAKEROOTKEY:+${BLUE}(fakeroot)${NORMAL} }" + local fake="${FAKEROOTKEY:+${BLUE}*${NORMAL}}" local name="${STRONG}${subpkgname:-$pkgname}${NORMAL}" - [ -z "$quiet" ] && printf "${prompt} ${fake}${name}: $@\n" >&2 + [ -z "$quiet" ] && printf "${prompt} ${name}${fake}: $@\n" >&2 } warning() { - local prompt="${YELLOW}>>> WARNING: ${NORMAL}" - local fake="${FAKEROOTKEY:+${BLUE}(fakeroot)${NORMAL} }" + local prompt="${YELLOW}>>> WARNING:${NORMAL}" + local fake="${FAKEROOTKEY:+${BLUE}*${NORMAL}}" local name="${STRONG}${subpkgname:-$pkgname}${NORMAL}" - printf "${prompt} ${fake}${name}: $@\n" >&2 + printf "${prompt} ${name}${fake}: $@\n" >&2 } error() { - local prompt="${RED}>>> ERROR: ${NORMAL}" - local fake="${FAKEROOTKEY:+${BLUE}(fakeroot)${NORMAL} }" + local prompt="${RED}>>> ERROR:${NORMAL}" + local fake="${FAKEROOTKEY:+${BLUE}*${NORMAL}}" local name="${STRONG}${subpkgname:-$pkgname}${NORMAL}" - printf "${prompt} ${fake}${name}: $@\n" >&2 + printf "${prompt} ${name}${fake}: $@\n" >&2 } -- cgit v1.2.3-70-g09d2