normalize output for monkeysphere when no subcommand is issued or when an unknown...

[monkeysphere.git] / src / monkeysphere

diff --git a/src/monkeysphere b/src/monkeysphere
index f21ca7c3603d85e1d0cfa432b957c203f1db6509..bc390ccca5e239a83e00e594f576d16cdc6e8fd6 100755 (executable)
--- a/src/monkeysphere
+++ b/src/monkeysphere
@@ -217,9 +217,13 @@ mkdir -p -m 0700 "$GNUPGHOME"
 export LOG_LEVEL
 export LOG_PREFIX
 
+if [ "$#" -eq 0 ] ; then 
+    usage
+    failure "Please supply a subcommand."
+fi
+
 # get subcommand
 COMMAND="$1"
-[ "$COMMAND" ] || $PGRM help
 shift
 
 case $COMMAND in
@@ -275,16 +279,16 @@ case $COMMAND in
        keys_from_userid "$@"
        ;;
 
-    'version'|'v')
+    'version'|'--version'|'v')
        version
        ;;
 
-    '--help'|'help'|'-h'|'h'|'?')
+    'help'|'--help'|'-h'|'h'|'?')
         usage
         ;;
 
     *)
         failure "Unknown command: '$COMMAND'
-Type '$PGRM help' for usage."
+Try '$PGRM help' for usage."
         ;;
 esac