[Monotone-commits-diffs] net.venge.monotone.contrib.usher: 9eaed7aeb4755329ce051ed277b78c229b6305c1

[code]

revision:            9eaed7aeb4755329ce051ed277b78c229b6305c1
date:                2011-04-30T05:16:03
author:              Richard Levitte <address@hidden>
branch:              net.venge.monotone.contrib.usher
changelog:
* utils/usherctl.in: Have usherctl display a usage when there are no
  subcommands.  Have it also exit 1 whenever it gets to print a usage.

manifest:
format_version "1"

new_manifest [43037bbf8051310e955f26a3fc578053e587b6a2]

old_revision [efb13f8e5ab02ce49f4a5fad607d2d19c460d896]

patch "utils/usherctl.in"
 from [359563a98fb7230867120be56308e262fe7b13cb]
   to [ccc337a7d26f25eea8f348652681b16fb365fa9a]
============================================================
--- utils/usherctl.in	359563a98fb7230867120be56308e262fe7b13cb
+++ utils/usherctl.in	ccc337a7d26f25eea8f348652681b16fb365fa9a
@@ -54,8 +54,9 @@ config_file="@sysconfdir@/usher/usherctl
 
 config_file="@sysconfdir@/usher/usherctl.conf"
 
-if ! TEMP=`POSIXLY_CORRECT=yes getopt c: "$@"`; then
+if ! TEMP=`POSIXLY_CORRECT=yes getopt c: "$@"` || [ $# -eq 0 ]; then
     echo "Usage: usherctl [ -c configfile ] [--] command [options] args..."
+    exit 1
 fi
 
 eval set -- "$TEMP"
@@ -744,6 +745,7 @@ case $1 in
 	adminaddr=127.0.0.1:12345
 	if ! TEMP=`POSIXLY_CORRECT=yes getopt A:a:l:u:p: "$@"`; then
 	    echo >&2 "Usage: usherctl init [ -A adminaddr ] [ -a automateaddr ] [ -l listenaddr ] [ -u adminuser ] [ -p adminpass ]"
+	    exit 1
 	fi
 	eval set -- "$TEMP"
 	while true; do
@@ -806,6 +808,7 @@ case $1 in
 	pattern=
 	if ! TEMP=`POSIXLY_CORRECT=yes getopt h:p: "$@"`; then
 	    echo >&2 "Usage: usherctl $op [ -h host ] [ -p pattern ] local|remote args..."
+	    exit 1
 	fi
 	eval set -- "$TEMP"
 	while true; do
@@ -883,6 +886,7 @@ case $1 in
 	t=
 	if ! TEMP=`POSIXLY_CORRECT=yes getopt cdpt "$@"`; then
 	    echo >&2 "Usage: usherctl info [ -cdpt ]"
+	    exit 1
 	fi
 	eval set -- "$TEMP"
 	while true; do
@@ -930,6 +934,7 @@ case $1 in
 	key=
 	if ! TEMP=`POSIXLY_CORRECT=yes getopt t: "$@"`; then
 	    echo >&2 "Usage: usherctl addkey [ -t keytype ]"
+	    exit 1
 	fi
 	eval set -- "$TEMP"
 	while true; do