summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJameson Graef Rollins <jrollins@finestructure.net>2009-02-21 16:29:35 -0500
committerJameson Graef Rollins <jrollins@finestructure.net>2009-02-21 16:29:35 -0500
commit3c73575de77e8d4d211258641179c71080b56856 (patch)
tree151617e16985bec6868cda1fa216bbee1a07557c
parent9847f362471d81b3f13af72f5a28740c94698c20 (diff)
fix output formatting for cases where multiple fingerprints are found, in functions that are doing that sort of thing
-rwxr-xr-xsrc/monkeysphere4
-rw-r--r--src/share/ma/add_certifier2
-rw-r--r--src/share/mh/add_revoker2
3 files changed, 3 insertions, 5 deletions
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