X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=src%2Fmonkeysphere;h=e268058f267fc7f1c030fe25127fdda2ea706ac1;hb=7919c1de41c62ab5971435ee9fcfcfff334a89c4;hp=e84ee63c24254041bd05becd0d0d4b2ce4712099;hpb=1c1b3a755c34be62ffcb412fd4704d60c74b0a28;p=monkeysphere.git

diff --git a/src/monkeysphere b/src/monkeysphere
index e84ee63..e268058 100755
--- a/src/monkeysphere
+++ b/src/monkeysphere
@@ -74,7 +74,7 @@ gpg_ssh_fingerprint() {
     trap "rm -f $tmpfile" EXIT
 
     # use temporary file, since ssh-keygen won't accept keys on stdin
-    gpg_user --export "$keyid" | openpgp2ssh "$keyid" >"$tmpfile"
+    gpg_user --export "$keyid" --no-armor | openpgp2ssh "$keyid" >"$tmpfile"
     ssh-keygen -l -f "$tmpfile" | awk '{ print $1, $2, $4 }'
 
     # remove the tmp file
@@ -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 "$@"
 	;;