X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=src%2Fmonkeysphere;h=36ecf9335b7b5732ad2e4cf266e112bd3ea9f117;hb=d23689f462039cb7f6fd8e3e5daee9bd08f6e5a3;hp=0726ff94a61fdd492f6475978fec41bee711ba80;hpb=fd03070ba488f9be9c479734bea9b0f741350221;p=monkeysphere.git

diff --git a/src/monkeysphere b/src/monkeysphere
index 0726ff9..36ecf93 100755
--- a/src/monkeysphere
+++ b/src/monkeysphere
@@ -219,7 +219,7 @@ export LOG_PREFIX
 
 # get subcommand
 COMMAND="$1"
-[ "$COMMAND" ] || failure "Type '$PGRM help' for usage."
+[ "$COMMAND" ] || (usage; exit 1)
 shift
 
 case $COMMAND in
@@ -275,11 +275,11 @@ case $COMMAND in
 	keys_from_userid "$@"
 	;;
 
-    'version'|'v')
+    'version'|'--version'|'v')
 	version
 	;;
 
-    '--help'|'help'|'-h'|'h'|'?')
+    'help'|'--help'|'-h'|'h'|'?')
         usage
         ;;