X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=src%2Fmonkeysphere;h=8ddfe7fdc93513d5552c93f40407206777f85825;hb=bb35e6ff08dbd33d3f47e9c969eb3da3a9acf18d;hp=cd7719345caefedbc9068327d809d6908d2941df;hpb=acb3000647031defca23b38d85e48954085a4d2a;p=monkeysphere.git

diff --git a/src/monkeysphere b/src/monkeysphere
index cd77193..8ddfe7f 100755
--- a/src/monkeysphere
+++ b/src/monkeysphere
@@ -32,7 +32,7 @@ umask 077
 ########################################################################
 
 usage() {
-cat <<EOF
+    cat <<EOF
 usage: $PGRM <subcommand> [options] [args]
 MonkeySphere client tool.
 
@@ -89,9 +89,22 @@ gen_subkey(){
 	esac
     done
 
-    keyID="$1"
+    if [ -z "$1" ] ; then
+	# find all secret keys
+	keyID=$(gpg --with-colons --list-secret-keys | grep ^sec | cut -f5 -d:)
+	# if multiple sec keys exist, fail
+	if (( $(echo "$keyID" | wc -l) > 1 )) ; then
+	    echo "Multiple secret keys found:"
+	    echo "$keyID"
+	    failure "Please specify which primary key to use."
+	fi
+    else
+	keyID="$1"
+    fi
     if [ -z "$keyID" ] ; then
-	failure "You must specify the key ID of your primary key."
+	failure "You have no secret key available.  You should create an OpenPGP
+key before joining the monkeysphere. You can do this with:
+   gpg --gen-key"
     fi
 
     # get key output, and fail if not found