From: Jameson Graef Rollins <jrollins@finestructure.net>
Date: Sat, 21 Feb 2009 21:29:35 +0000 (-0500)
Subject: fix output formatting for cases where multiple fingerprints are found, in functions... 
X-Git-Tag: monkeysphere_0.23~11
X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=3c73575de77e8d4d211258641179c71080b56856;p=monkeysphere.git

fix output formatting for cases where multiple fingerprints are found, in functions that are doing that sort of thing
---

diff --git a/src/monkeysphere b/src/monkeysphere
index 0d8f4ff..fd96f45 100755
--- a/src/monkeysphere
+++ b/src/monkeysphere
@@ -87,9 +87,7 @@ check_gpg_sec_key_id() {
 	    ;;
 	*)
 	    echo "Multiple primary secret keys found:"
-	    for key in $(echo "$gpgSecOut" | cut -d: -f5) ; do
-		echo "  $key"
-	    done
+	    echo "$gpgSecOut" | cut -d: -f5
 	    echo "Please specify which primary key to use."
 	    failure
 	    ;;
diff --git a/src/share/ma/add_certifier b/src/share/ma/add_certifier
index eba6893..6f85ecf 100644
--- a/src/share/ma/add_certifier
+++ b/src/share/ma/add_certifier
@@ -126,7 +126,7 @@ else
     if (( $(echo "$fingerprint" | wc -l) != 1 )) ; then
 	cat <<EOF
 More than one fingerprint found:
-  echo $fingerprint
+$fingerprint
 Please use a more specific key ID.
 EOF
 	failure
diff --git a/src/share/mh/add_revoker b/src/share/mh/add_revoker
index 50e8c67..2ae531e 100644
--- a/src/share/mh/add_revoker
+++ b/src/share/mh/add_revoker
@@ -80,7 +80,7 @@ else
     if (( $(echo "$fingerprint" | wc -l) != 1 )) ; then
 	cat <<EOF
 More than one fingerprint found:
-  echo $fingerprint
+$fingerprint
 Please use a more specific key ID.
 EOF
 	failure