From 54e5dd2bd3d63238142c748c64fdf66135a47136 Mon Sep 17 00:00:00 2001
From: Jameson Graef Rollins <jrollins@finestructure.net>
Date: Tue, 17 Feb 2009 00:36:07 -0500
Subject: [PATCH] fix a couple of left over references to expert

---
 src/monkeysphere-authentication |  4 ++--
 src/monkeysphere-host           |  3 ++-
 src/share/ma/diagnostics        |  2 +-
 src/share/mh/diagnostics        |  2 +-
 tests/basic                     | 12 ++++++------
 5 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/monkeysphere-authentication b/src/monkeysphere-authentication
index 4a09527..465777d 100755
--- a/src/monkeysphere-authentication
+++ b/src/monkeysphere-authentication
@@ -86,8 +86,8 @@ gpg_sphere() {
     su_monkeysphere_user "gpg $@"
 }
 
-# load the core fingerprint into the fingerprint variable, using the
-# gpg host secret key
+# output to stdout the core fingerprint from the gpg core secret
+# keyring
 core_fingerprint() {
     log debug "determining core key fingerprint..."
     gpg_core --quiet --list-secret-key \
diff --git a/src/monkeysphere-host b/src/monkeysphere-host
index 6220760..8562ec6 100755
--- a/src/monkeysphere-host
+++ b/src/monkeysphere-host
@@ -181,7 +181,8 @@ show_key() {
 	| grep '^fpr:' | cut -d: -f10 )
 
     # list the host key info
-    gpg --list-key --fingerprint --list-options show-unusable-uids 2>/dev/null
+    gpg --list-keys --fingerprint \
+	--list-options show-unusable-uids 2>/dev/null
 
     # list the pgp fingerprint
     echo "OpenPGP fingerprint: $HOST_FINGERPRINT"
diff --git a/src/share/ma/diagnostics b/src/share/ma/diagnostics
index 45a8ce2..0411080 100644
--- a/src/share/ma/diagnostics
+++ b/src/share/ma/diagnostics
@@ -120,7 +120,7 @@ fi
 
 if [ "$problemsfound" -gt 0 ]; then
     echo "When the above $problemsfound issue"$(if [ "$problemsfound" -eq 1 ] ; then echo " is" ; else echo "s are" ; fi)" resolved, please re-run:"
-    echo "  monkeysphere-authentication expert diagnostics"
+    echo "  monkeysphere-authentication diagnostics"
 else
     echo "Everything seems to be in order!"
 fi
diff --git a/src/share/mh/diagnostics b/src/share/mh/diagnostics
index 96065e6..d774723 100644
--- a/src/share/mh/diagnostics
+++ b/src/share/mh/diagnostics
@@ -152,7 +152,7 @@ fi
 
 if [ "$problemsfound" -gt 0 ]; then
     echo "When the above $problemsfound issue"$(if [ "$problemsfound" -eq 1 ] ; then echo " is" ; else echo "s are" ; fi)" resolved, please re-run:"
-    echo "  monkeysphere-host expert diagnostics"
+    echo "  monkeysphere-host diagnostics"
 else
     echo "Everything seems to be in order!"
 fi
diff --git a/tests/basic b/tests/basic
index 4c19a85..d78a594 100755
--- a/tests/basic
+++ b/tests/basic
@@ -170,17 +170,17 @@ echo "### import host key..."
 ssh-keygen -b 1024 -t rsa -N '' -f "$TEMPDIR"/ssh_host_rsa_key
 monkeysphere-host import-key testhost < "$TEMPDIR"/ssh_host_rsa_key
 
+echo "##################################################"
+echo "### getting host key fingerprint..."
+HOSTKEYID=$( monkeysphere-host show-key | grep '^OpenPGP fingerprint: ' | cut -f3 -d\  )
+echo "$HOSTKEYID"
+
 # change host key expiration
 echo "##################################################"
 echo "### setting host key expiration..."
 monkeysphere-host set-expire 1
 # FIXME: how do we check that the expiration has really been set?
 
-echo "##################################################"
-echo "### getting host key fingerprint..."
-HOSTKEYID=$( monkeysphere-host show-key | grep '^OpenPGP fingerprint: ' | cut -f3 -d\  )
-echo "$HOSTKEYID"
-
 # certify host key with the "Admin's Key".
 # (this would normally be done via keyservers)
 echo "##################################################"
@@ -236,7 +236,7 @@ gpgadmin --armor --export "$HOSTKEYID" | gpg --import
 # teach the "server" about the testuser's key
 echo "##################################################"
 echo "### export testuser key to server..."
-gpg --export testuser | monkeysphere-authentication expert gpg-cmd --import
+gpg --export testuser | monkeysphere-authentication gpg-cmd --import
 
 # update authorized_keys for user
 echo "##################################################"
-- 
2.25.1