update george changelog with my changes

[monkeysphere.git] / src / monkeysphere

diff --git a/src/monkeysphere b/src/monkeysphere
index 1dee3bab81411bf6c03441a0dfa6fc3cf1c089ae..7c928521e058c1c67824c9c98a674866d287e589 100755 (executable)
--- a/src/monkeysphere
+++ b/src/monkeysphere
@@ -3,7 +3,7 @@
 # monkeysphere: Monkeysphere client tool
 #
 # The monkeysphere scripts are written by:
-# Jameson Rollins <jrollins@fifthhorseman.net>
+# Jameson Rollins <jrollins@finestructure.net>
 # Jamie McClelland <jm@mayfirst.org>
 # Daniel Kahn Gillmor <dkg@fifthhorseman.net>
 # Micah Anderson <micah@riseup.net>
@@ -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
@@ -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 "$@"
        ;;