From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Wed, 3 Sep 2008 01:24:33 +0000 (-0400)
Subject: tuning how monkeysphere looks for secret keys.
X-Git-Tag: monkeysphere_0.13-1~27
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=0352609ba566585484da022b6512520629b9981f;p=monkeysphere.git

tuning how monkeysphere looks for secret keys.
---

diff --git a/src/monkeysphere b/src/monkeysphere
index 92beafd..471da20 100755
--- a/src/monkeysphere
+++ b/src/monkeysphere
@@ -93,7 +93,7 @@ gen_subkey(){
 
     if [ -z "$1" ] ; then
 	# find all secret keys
-	keyID=$(gpg --with-colons --list-secret-keys | grep ^sec | cut -f5 -d:)
+	keyID=$(gpg --with-colons --list-secret-keys | grep ^sec | cut -f5 -d: | sort -u)
 	# if multiple sec keys exist, fail
 	if (( $(echo "$keyID" | wc -l) > 1 )) ; then
 	    echo "Multiple secret keys found:"
@@ -115,7 +115,7 @@ key before joining the monkeysphere. You can do this with:
 
     # fail if multiple sec lines are returned, which means the id
     # given is not unique
-    if [ $(echo "$gpgOut" | grep '^sec:' | wc -l) -gt '1' ] ; then
+    if [ $(echo "$gpgOut" | grep -c '^sec:') -gt '1' ] ; then
 	failure "Key ID '$keyID' is not unique."
     fi