From 0bad1dc709ee21f3e93cfa0866fc0478a5e884a0 Mon Sep 17 00:00:00 2001
From: Trygve Laugstøl <trygvis@inamo.no>
Date: Fri, 1 Feb 2013 12:46:56 +0100
Subject: o Consistent usage() usage/flow.

---
 lib/common | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

(limited to 'lib')

diff --git a/lib/common b/lib/common
index 63f712a..0c8cdbd 100755
--- a/lib/common
+++ b/lib/common
@@ -40,7 +40,7 @@ assert_is_app() {
   fi
 }
 
-usage() {
+show_help() {
   message=${1-}
 
   if [[ $message != "" ]]
@@ -48,9 +48,24 @@ usage() {
     echo $message
   fi
 
-  if [ "`declare -f usage_inner >/dev/null; echo $?`" = 0 ]
+  if [ "`declare -f usage_text >/dev/null; echo $?`" = 0 ]
+  then
+    usage_text
+  fi
+  exit 1
+}
+
+usage() {
+  message=${1-}
+
+  if [[ $message != "" ]]
+  then
+    echo $message >&2
+  fi
+
+  if [ "`declare -f usage_text >/dev/null; echo $?`" = 0 ]
   then
-    usage_inner >&2
+    usage_text >&2
   fi
   exit 1
 }
-- 
cgit v1.2.3