From 19b5663b9ef06a800831d09a3cbceb937923429d Mon Sep 17 00:00:00 2001 From: Mike Burns Date: Fri, 30 May 2014 14:17:32 +0200 Subject: On bad args, show usage and exit The lsrc(1), mkrc(1), rcup(1), and rcdn(1) commands will now print a usage message and exit immediately (with 64, `EX_USAGE`) when given an option it does not understand. This includes `--version` and `--help`. Normal `-h` will print usage and exit successfully, as normal. Closes #59. --- test/lsrc-usage.t | 7 +++++++ test/mkrc-usage.t | 11 +++++++++-- test/rcup-usage.t | 7 +++++++ 3 files changed, 23 insertions(+), 2 deletions(-) (limited to 'test') diff --git a/test/lsrc-usage.t b/test/lsrc-usage.t index 83c9c21..1e01993 100644 --- a/test/lsrc-usage.t +++ b/test/lsrc-usage.t @@ -5,3 +5,10 @@ $ lsrc -h Usage: lsrc [-FhqVv] [-B HOSTNAME] [-d DOT_DIR] [-I EXCL_PAT] [-S EXCL_PAT ] [-t TAG] [-x EXCL_PAT] see lsrc(1) and rcm(7) for more details + +Unsupported options should output usage information and exit EX_USAGE + + $ lsrc --version + Usage: lsrc [-FhqVv] [-B HOSTNAME] [-d DOT_DIR] [-I EXCL_PAT] [-S EXCL_PAT ] [-t TAG] [-x EXCL_PAT] + see lsrc(1) and rcm(7) for more details + [64] diff --git a/test/mkrc-usage.t b/test/mkrc-usage.t index d4f4a9f..4649152 100644 --- a/test/mkrc-usage.t +++ b/test/mkrc-usage.t @@ -1,14 +1,21 @@ $ . "$TESTDIR/helper.sh" -no arguments should output usage information and exit 1 +no arguments should output usage information and exit EX_USAGE $ mkrc Usage: mkrc [-ChSsVvqo] [-t TAG] [-d DIR] [-B HOSTNAME] FILES ... see mkrc(1) and rcm(7) for more details - [1] + [64] -h should output usage information and exit 0 $ mkrc -h Usage: mkrc [-ChSsVvqo] [-t TAG] [-d DIR] [-B HOSTNAME] FILES ... see mkrc(1) and rcm(7) for more details + +Unsupported options should output usage information and exit EX_USAGE + + $ mkrc --version + Usage: mkrc [-ChSsVvqo] [-t TAG] [-d DIR] [-B HOSTNAME] FILES ... + see mkrc(1) and rcm(7) for more details + [64] diff --git a/test/rcup-usage.t b/test/rcup-usage.t index 1fa8a5a..336c668 100644 --- a/test/rcup-usage.t +++ b/test/rcup-usage.t @@ -5,3 +5,10 @@ $ rcup -h Usage: rcup [-CfhiKkqVv] [-B HOSTNAME] [-d DOT_DIR] [-I EXCL_PAT] [-S EXCL_PAT] [-t TAG] [-x EXCL_PAT] see rcup(1) and rcm(7) for more details + +Unsupported options should output usage information and exit EX_USAGE + + $ rcup --version + Usage: rcup [-CfhiKkqVv] [-B HOSTNAME] [-d DOT_DIR] [-I EXCL_PAT] [-S EXCL_PAT] [-t TAG] [-x EXCL_PAT] + see rcup(1) and rcm(7) for more details + [64] -- cgit v1.2.3