From: Jameson Graef Rollins <jrollins@finestructure.net>
Date: Sun, 1 Mar 2009 18:34:01 +0000 (-0500)
Subject: fix two bugs in monkeysphere:check_gpg_sec_key_id that were causing gen_subkey to... 
X-Git-Tag: monkeysphere_0.24~41^2
X-Git-Url: https://codewiz.org/gitweb?p=monkeysphere.git;a=commitdiff_plain;h=714735a79cd33760a44a7c7356d8d8c44776cc5f

fix two bugs in monkeysphere:check_gpg_sec_key_id that were causing gen_subkey to fail
---

diff --git a/src/monkeysphere b/src/monkeysphere
index 6db4827..809b1ac 100755
--- a/src/monkeysphere
+++ b/src/monkeysphere
@@ -69,7 +69,7 @@ check_gpg_sec_key_id() {
 	    gpgSecOut=$(gpg_user --fixed-list-mode --list-secret-keys --with-colons 2>/dev/null | egrep '^sec:')
 	    ;;
 	1)
-	    gpgSecOut=$(gpg_user --fixed-list-mode --list-secret-keys --with-colons "$keyID" | egrep '^sec:') || failure
+	    gpgSecOut=$(gpg_user --fixed-list-mode --list-secret-keys --with-colons "$1" | egrep '^sec:') || failure
 	    ;;
 	*)
 	    failure "You must specify only a single primary key ID."
@@ -86,9 +86,9 @@ check_gpg_sec_key_id() {
 	    echo "$gpgSecOut" | cut -d: -f5
 	    ;;
 	*)
-	    echo "Multiple primary secret keys found:"
-	    echo "$gpgSecOut" | cut -d: -f5
-	    echo "Please specify which primary key to use."
+	    echo "Multiple primary secret keys found:" >&2
+	    echo "$gpgSecOut" | cut -d: -f5 >&2
+	    echo "Please specify which primary key to use." >&2
 	    failure
 	    ;;
     esac