Fix tests for gen-subkey.

1 files changed, 7 insertions, 12 deletions

diff --git a/src/monkeysphere b/src/monkeysphere
index 2227b91..5e8b184 100755
--- a/src/monkeysphere
+++ b/src/monkeysphere
@@ -94,23 +94,18 @@ gen_subkey(){
 	failure "You must specify the key ID of your primary key."
     fi
 
-    gpgOut=$(gpg --quiet --fixed-list-mode --list-keys --with-colons \
-	"$keyID" 2> /dev/null)
+    # get key output, and fail if not found
+    gpgOut=$(gpg --quiet --fixed-list-mode --list-secret-keys --with-colons \
+	"$keyID") || failure
 
-    # fail if there only "tru" lines are output from gpg, which
-    # indicates the key was not found.
-    if [ -z "$(echo "$gpgOut" | grep -v '^tru:')" ] ; then
-	failure "Key ID '$keyID' not found."
-    fi
-
-    # fail if multiple pub lines are returned, which means the id given
-    # is not unique
-    if [ $(echo "$gpgOut" | grep '^pub:' | wc -l) -gt '1' ] ; then
+    # 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
 	failure "Key ID '$keyID' is not unique."
     fi
 
     # prompt if an authentication subkey already exists
-    if echo "$gpgOut" | egrep "^(pub|sub):" | cut -d: -f 12 | grep -q a ; then
+    if echo "$gpgOut" | egrep "^(sec|ssb):" | cut -d: -f 12 | grep -q a ; then
 	echo "An authentication subkey already exists for key '$keyID'."
 	read -p "Are you sure you would like to generate another one? (y/N) " OK; OK=${OK:N}
 	if [ "${OK/y/Y}" != 'Y' ] ; then