X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=src%2Fmonkeysphere;h=233e63f8e0e56c2faa1a1597b90ce9ae19ad0d70;hb=fb1f418bda543af10195828a19a7c8cc2b250f8c;hp=f21ca7c3603d85e1d0cfa432b957c203f1db6509;hpb=109f4ed7d4aea89fa03701d105a9b8422209c170;p=monkeysphere.git

diff --git a/src/monkeysphere b/src/monkeysphere
index f21ca7c..233e63f 100755
--- a/src/monkeysphere
+++ b/src/monkeysphere
@@ -50,7 +50,7 @@ subcommands:
  subkey-to-ssh-agent (s)             store authentication subkey in ssh-agent
  sshfpr (f) KEYID                    output ssh fingerprint of gpg key
 
- keys-from-userid (u) USERID         output valid keys for user id literal
+ keys-for-userid (u) USERID          output valid keys for user id literal
  gen-subkey (g) [KEYID]              generate an authentication subkey
    --length (-l) BITS                  key length in bits (2048)
 
@@ -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
@@ -271,20 +275,25 @@ case $COMMAND in
 	gpg_ssh_fingerprint "$@"
 	;;
 
-    'keys-from-userid'|'u')
-	keys_from_userid "$@"
+    'keys-for-userid'|'u')
+	keys_for_userid "$@"
+	;;
+
+    'keys-from-userid')
+	echo "Warning: this usage is deprecated.  Please use 'keys-for-userid' instead." >&2
+	keys_for_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