From b536f99e6f1790df174879cc82045d71db42a099 Mon Sep 17 00:00:00 2001 From: tv Date: Thu, 14 Nov 2013 10:31:01 +0100 Subject: ship core: homogenize logging --- ship/lib/core | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'ship/lib/core') diff --git a/ship/lib/core b/ship/lib/core index d1a7333e..5df146a1 100644 --- a/ship/lib/core +++ b/ship/lib/core @@ -1,8 +1,8 @@ # logging -msg() { printf "$@\n" >&2 ;} -info() { msg "** $@" ;} -error() { msg "!! $@" ;} -die() { error "$@" ;exit 1;} +msg() { echo "$*" >&2; } +info() { msg "** $*"; } +error() { msg "!! $*"; } +die() { error "$*"; exit 1; } exists(){ type "$1" >/dev/null 2>/dev/null; } is_root(){ test $(id -u) -eq 0 -- cgit v1.2.3 From 168f5927f4a7b69b23f7d90e5a2dd36c6fe78a01 Mon Sep 17 00:00:00 2001 From: tv Date: Thu, 14 Nov 2013 10:40:32 +0100 Subject: ship: move all "bailing out" msgs to die --- ship/lib/core | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'ship/lib/core') diff --git a/ship/lib/core b/ship/lib/core index 5df146a1..7c5cbf46 100644 --- a/ship/lib/core +++ b/ship/lib/core @@ -2,7 +2,11 @@ msg() { echo "$*" >&2; } info() { msg "** $*"; } error() { msg "!! $*"; } -die() { error "$*"; exit 1; } +die() { + error "$*" + error 'Bailing out.' + exit 1 +} exists(){ type "$1" >/dev/null 2>/dev/null; } is_root(){ test $(id -u) -eq 0 -- cgit v1.2.3 From c27074f54f30b5d2acc870479ef76d303e46d88e Mon Sep 17 00:00:00 2001 From: tv Date: Thu, 14 Nov 2013 12:48:55 +0100 Subject: ship core die: make reason optional --- ship/lib/core | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'ship/lib/core') diff --git a/ship/lib/core b/ship/lib/core index 7c5cbf46..d6e01352 100644 --- a/ship/lib/core +++ b/ship/lib/core @@ -2,8 +2,9 @@ msg() { echo "$*" >&2; } info() { msg "** $*"; } error() { msg "!! $*"; } +## usage: die [REASON...] die() { - error "$*" + test $# -gt 0 && error "$*" error 'Bailing out.' exit 1 } -- cgit v1.2.3