From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-731208-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
	by finch.gentoo.org (Postfix) with ESMTP id 9977613838B
	for <garchives@archives.gentoo.org>; Wed, 10 Sep 2014 20:35:54 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 136EBE085D;
	Wed, 10 Sep 2014 20:35:52 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by pigeon.gentoo.org (Postfix) with ESMTPS id 57DC0E081D
	for <gentoo-commits@lists.gentoo.org>; Wed, 10 Sep 2014 20:35:51 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id 3A42133FEEE
	for <gentoo-commits@lists.gentoo.org>; Wed, 10 Sep 2014 20:35:50 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id E2AA252B8
	for <gentoo-commits@lists.gentoo.org>; Wed, 10 Sep 2014 20:35:48 +0000 (UTC)
From: "Mike Frysinger" <vapier@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Mike Frysinger" <vapier@gentoo.org>
Message-ID: <1410378680.9133fc879c354c0889e775d6a42c3fa21efe8fe7.vapier@gentoo>
Subject: [gentoo-commits] proj/releng:master commit in: tools/
X-VCS-Repository: proj/releng
X-VCS-Files: tools/catalyst-auto
X-VCS-Directories: tools/
X-VCS-Committer: vapier
X-VCS-Committer-Name: Mike Frysinger
X-VCS-Revision: 9133fc879c354c0889e775d6a42c3fa21efe8fe7
X-VCS-Branch: master
Date: Wed, 10 Sep 2014 20:35:48 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: cab392d4-9911-4f75-9600-72520eefe4a1
X-Archives-Hash: e3d323d93d101a0a7a8f784af8bf1f09

commit:     9133fc879c354c0889e775d6a42c3fa21efe8fe7
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 10 19:51:20 2014 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Wed Sep 10 19:51:20 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/releng.git;a=commit;h=9133fc87

catalyst-auto: clean up usage a bit

---
 tools/catalyst-auto | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/tools/catalyst-auto b/tools/catalyst-auto
index aa4ec1d..3aa98b2 100755
--- a/tools/catalyst-auto
+++ b/tools/catalyst-auto
@@ -19,10 +19,10 @@ testing=0
 set -o pipefail
 
 usage() {
-  msg=$1
+  local msg=$1
 
   if [ -n "${msg}" ]; then
-    echo -e "${msg}\n";
+    printf "%b\n\n" "${msg}"
   fi
 
   cat <<EOH
@@ -104,8 +104,7 @@ do
       testing=1
       ;;
     -*)
-      echo "You have specified an invalid option: ${a}"
-      usage
+      usage "ERROR: You have specified an invalid option: ${a}"
       exit 1
       ;;
     esac
@@ -113,7 +112,7 @@ done
 
 # Make sure all required values were specified
 if [ -z "${config_file}" -o ! -e "${config_file}" ]; then
-  usage "You must specify a valid config file to use"
+  usage "ERROR: You must specify a valid config file to use"
   exit 1
 fi