fix output formatting for cases where multiple fingerprints are found, in functions...

diff --git a/src/monkeysphere b/src/monkeysphere
index 0d8f4ff8011adb8882ee6f6a4b6b47212b02723d..fd96f45e746d78ce09f8f76d3f14932152e47a25 100755 (executable)
--- 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 eba689323bfe43d2d2a98511631595f69b651232..6f85ecfb904321906409af414b6c7503ce611e1c 100644 (file)
--- 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 50e8c67456d42a3fee0c68e09a8a4aa654bbdfe7..2ae531e82c15f08fb98af01e2cecb92982a18b0b 100644 (file)
--- 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