add some useful shortcuts for some common commands

[monkeysphere.git] / src / monkeysphere

diff --git a/src/monkeysphere b/src/monkeysphere
index 36ecf9335b7b5732ad2e4cf266e112bd3ea9f117..648f5e9886a61ca95349d81953232612c91283fe 100755 (executable)
--- 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)
 
@@ -146,7 +146,7 @@ check_gpg_authentication_subkey() {
        # if authentication key is valid, prompt to continue
        if [ "$validity" = 'u' ] ; then
            echo "A valid authentication key already exists for primary key '$keyID'." 1>&2
-           if [ "$PROMPT" = "true" ] ; then
+           if [ "$PROMPT" != "false" ] ; then
                printf "Are you sure you would like to generate another one? (y/N) " >&2
                read OK; OK=${OK:N}
                if [ "${OK/y/Y}" != 'Y' ] ; then
@@ -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" ] || (usage; exit 1)
 shift
 
 case $COMMAND in
@@ -247,7 +251,7 @@ case $COMMAND in
        process_authorized_user_ids "$AUTHORIZED_USER_IDS"
        ;;
 
-    'import-subkey'|'i')
+    'import-subkey'|'import'|'i')
        source "${MSHAREDIR}/import_subkey"
        import_subkey "$@"
        ;;
@@ -271,8 +275,13 @@ 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: 'keys-from-userid' is deprecated.  Please use 'keys-for-userid' instead." >&2
+       keys_for_userid "$@"
        ;;
 
     'version'|'--version'|'v')
@@ -285,6 +294,6 @@ case $COMMAND in
 
     *)
         failure "Unknown command: '$COMMAND'
-Type '$PGRM help' for usage."
+Try '$PGRM help' for usage."
         ;;
 esac