diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2009-01-26 13:32:44 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2009-01-26 13:32:44 +0000 |
| commit | 044359f0ade2460cfc1498a4633e9de5c807eef7 (patch) | |
| tree | 1b8d860a827966443a48872e635685c51a050bbb | |
| parent | e609357a1c6ce32fba94c84c58502ebed19ebe32 (diff) | |
| download | abuild-044359f0ade2460cfc1498a4633e9de5c807eef7.tar.gz abuild-044359f0ade2460cfc1498a4633e9de5c807eef7.tar.bz2 abuild-044359f0ade2460cfc1498a4633e9de5c807eef7.tar.xz abuild-044359f0ade2460cfc1498a4633e9de5c807eef7.zip | |
abuild: style fixes
| -rwxr-xr-x | abuild | 2 | ||||
| -rw-r--r-- | functions.sh | 16 |
2 files changed, 9 insertions, 9 deletions
@@ -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 } |