made public use of m-h show-keys instead of show-key, fixed stupid field-numbering...

diff --git a/src/monkeysphere-host b/src/monkeysphere-host
index 2335f1a0f2a8ed350af4ad6af78ec3bcf7ccda39..c9b6a4c683a6410cf178b25fc5cd9c318af4bb0b 100755 (executable)
--- a/src/monkeysphere-host
+++ b/src/monkeysphere-host
@@ -93,12 +93,12 @@ gpg_host_edit() {
 update_pgp_pub_file() {
     log debug "updating openpgp public key file '$HOST_KEY_FILE'..."
     gpg_host --export --armor --export-options export-minimal \
-        $(gpg_host --list-secret-keys --with-colons --fingerprint | grep ^fpr | cut -f9 -d:) \
+        $(gpg_host --list-secret-keys --with-colons --fingerprint | grep ^fpr | cut -f10 -d:) \
         > "$HOST_KEY_FILE"
 }
 
 host_fingerprints() {
-    local fprs=($(<"$HOST_KEY_FILE" "$SYSSHAREDIR/keytrans" listfprs))
+    local fprs=($(gpg_host --list-secret-keys --with-colons --fingerprint | grep ^fpr: | cut -f10 -d:))
 
     log debug "host key fingerprints:"
     printf '%s\n' "${fprs[@]}" | log debug
@@ -136,7 +136,7 @@ Please run 'monkeysphere-host import-key' to import a key."
        *)
            if [ -z "$keyID" ] ; then
                failure "Your host keyring contains multiple keys.
-Please specify one to act on (see 'monkeysphere-host show-key')."
+Please specify one to act on (see 'monkeysphere-host show-keys')."
            fi
            ;;
     esac

diff --git a/tests/basic b/tests/basic
index d8d24ce3309f7c9b6ff97f619c308dfada615321..67553294d7303f4afbcd5059a09cfa0b5d6929a1 100755 (executable)
--- a/tests/basic
+++ b/tests/basic
@@ -257,7 +257,7 @@ monkeysphere-host import-key "$TEMPDIR"/ssh_host_rsa_key ssh://testhost
 echo
 echo "##################################################"
 echo "### getting host key fingerprint..."
-SSHHOSTKEYID=$( monkeysphere-host show-key | grep '^OpenPGP fingerprint: ' | cut -f3 -d\  )
+SSHHOSTKEYID=$( monkeysphere-host show-keys | grep '^OpenPGP fingerprint: ' | cut -f3 -d\  )
 echo "$SSHHOSTKEYID"
 
 # change host key expiration