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

diff --git a/src/monkeysphere b/src/monkeysphere
index 233e63f..648f5e9 100755
--- a/src/monkeysphere
+++ b/src/monkeysphere
@@ -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
@@ -251,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 "$@"
 	;;
@@ -280,7 +280,7 @@ case $COMMAND in
 	;;
 
     'keys-from-userid')
-	echo "Warning: this usage is deprecated.  Please use 'keys-for-userid' instead." >&2
+	echo "Warning: 'keys-from-userid' is deprecated.  Please use 'keys-for-userid' instead." >&2
 	keys_for_userid "$@"
 	;;