X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=src%2Fmonkeysphere-host;h=d89febb690ed92c1c84f1f27eaa0f446b63fce1b;hb=e3bb810e188cae2d40a5191500a501c85cb93381;hp=884c1b794524951d8ed90bb94339a5f2c9301952;hpb=91fdd7dab0b3ea6dba4cc6f12083cba420610725;p=monkeysphere.git

diff --git a/src/monkeysphere-host b/src/monkeysphere-host
index 884c1b7..d89febb 100755
--- a/src/monkeysphere-host
+++ b/src/monkeysphere-host
@@ -256,11 +256,12 @@ multi_key() {
     shift
     local keys=$@
     local i=0
-    local fprs=($(list_primary_fingerprints <"$HOST_KEY_FILE"))
     local key
 
     check_no_keys
 
+    local fprs=($(list_primary_fingerprints <"$HOST_KEY_FILE"))
+
     if [[ -z "$1" || "$1" == '--all' ]] ; then
 	keys="${fprs[@]}"
     fi
@@ -301,7 +302,7 @@ show_key() {
 
     # create the ssh key
     tmpssh="$GNUPGHOME"/ssh_host_key_rsa_pub
-    gpg --export "$fingerprint" 2>/dev/null \
+    gpg --export --no-armor "$fingerprint" 2>/dev/null \
 	| openpgp2ssh 2>/dev/null >"$tmpssh"
 
     # list the host key info
@@ -378,7 +379,7 @@ COMMAND="$1"
 shift
 
 case $COMMAND in
-    'import-key'|'i')
+    'import-key'|'import'|'i')
 	source "${MHSHAREDIR}/import_key"
 	import_key "$@"
 	;;
@@ -387,7 +388,7 @@ case $COMMAND in
 	multi_key show_key "$@"
 	;;
 
-    'set-expire'|'extend-key'|'e')
+    'set-expire'|'extend-key'|'extend'|'e')
 	source "${MHSHAREDIR}/set_expire"
 	set_expire "$@"
 	;;
@@ -426,7 +427,7 @@ case $COMMAND in
 	update_pgp_pub_file
 	;;
 
-    'version'|'v')
+    'version'|'--version'|'v')
 	version
 	;;