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

diff --git a/src/monkeysphere b/src/monkeysphere
index 0726ff9..648f5e9 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)
 
@@ -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" ] || failure "Type '$PGRM help' for usage."
 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,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: 'keys-from-userid' 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