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.

---
 libexec/app-cat-conf       | 3 +--
 libexec/app-install-file   | 3 +--
 libexec/app-resolver-maven | 2 +-
 libexec/app-run-hook       | 4 ++--
 4 files changed, 5 insertions(+), 7 deletions(-)

(limited to 'libexec')

diff --git a/libexec/app-cat-conf b/libexec/app-cat-conf
index c75955b..af382f7 100755
--- a/libexec/app-cat-conf
+++ b/libexec/app-cat-conf
@@ -32,8 +32,7 @@ do
       name=$OPTARG
       ;;
     \?)
-      echo "Invalid option: $OPTARG" >&2
-      exit 1
+      usage "Invalid option: $OPTARG"
       ;;
   esac
 done
diff --git a/libexec/app-install-file b/libexec/app-install-file
index c08a632..e2707a0 100755
--- a/libexec/app-install-file
+++ b/libexec/app-install-file
@@ -8,9 +8,8 @@ APPSH_HOME=$(cd $(dirname "$0")/.. && pwd)
 . $APPSH_HOME/lib/common
 # HEADER END
 
-usage() {
+usage_text() {
   echo "usage: $0 -v <version> -f <file>"
-  exit 1
 }
 
 version=
diff --git a/libexec/app-resolver-maven b/libexec/app-resolver-maven
index 81e85ab..8394ee1 100755
--- a/libexec/app-resolver-maven
+++ b/libexec/app-resolver-maven
@@ -8,7 +8,7 @@ APPSH_HOME=$(cd $(dirname "$0")/.. && pwd)
 . $APPSH_HOME/lib/common
 # HEADER END
 
-usage_inner() {
+usage_text() {
   echo "usage: $usage_app init -r <repo> <maven url>"
   echo "usage: $usage_app resolve-version"
   echo "usage: $usage_app download-version -v <version> -f <download target>"
diff --git a/libexec/app-run-hook b/libexec/app-run-hook
index 6f1eab5..f1b2457 100755
--- a/libexec/app-run-hook
+++ b/libexec/app-run-hook
@@ -8,8 +8,8 @@ APPSH_HOME=$(cd $(dirname "$0")/.. && pwd)
 . $APPSH_HOME/lib/common
 # HEADER END
 
-usage() {
-  echo "usage: $usage_app -v [version] -h [hook]" 2>&1
+usage_text() {
+  echo "usage: $usage_app -v [version] -h [hook]"
 }
 
 version=
-- 
cgit v1.2.3