From 168f5927f4a7b69b23f7d90e5a2dd36c6fe78a01 Mon Sep 17 00:00:00 2001
From: tv <tv@nomic.retiolum>
Date: Thu, 14 Nov 2013 10:40:32 +0100
Subject: ship: move all "bailing out" msgs to die

---
 ship/lib/core    | 6 +++++-
 ship/lib/network | 3 +--
 ship/lib/punani  | 1 -
 3 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'ship/lib')

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
diff --git a/ship/lib/network b/ship/lib/network
index 74edcbac..e1a9a31e 100644
--- a/ship/lib/network
+++ b/ship/lib/network
@@ -57,8 +57,7 @@ which_telnet(){
   elif exists busybox;then
     echo  `command -v busybox` telnet
   else
-    error "Cannot find telnet binary, please install either telnet-client or busybox or netcat or provided TELNET environment.\nbailing out!" 
-    return 1
+    die 'Cannot find telnet binary, please install either telnet-client or busybox or netcat or provided TELNET environment.'
   fi
 }
 
diff --git a/ship/lib/punani b/ship/lib/punani
index c07763a4..84881dbf 100644
--- a/ship/lib/punani
+++ b/ship/lib/punani
@@ -2,7 +2,6 @@
 #@include _punani_db
 
 _punani_resolve_package(){
-  : ${PACKER?PACKER is not set,bailing out}
   pkg=${1?please provide package name to resolve}
   eval printf "%s" \"\${_punanidb_${PACKER}_${pkg}-}\" | grep .
 }
-- 
cgit v1.2.3