X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=src%2Fmonkeysphere;h=23ebd63d0eedb8404a229e95853ac1f71e931b1f;hb=785736d891f6c61eb5d7f4f10687ef9a0d920c3b;hp=636919796f1caf36e2300a7fb8f0344838029971;hpb=5ff6e131ad52ce4de7172e56170ea4f37e397a9e;p=monkeysphere.git

diff --git a/src/monkeysphere b/src/monkeysphere
index 6369197..23ebd63 100755
--- a/src/monkeysphere
+++ b/src/monkeysphere
@@ -45,14 +45,12 @@ EOF
 }
 
 # generate a subkey with the 'a' usage flags set
-# FIXME: not working yet.
+# FIXME: this needs some tweaking to clean it up
 gen_subkey(){
     local keyID
     local gpgOut
     local userID
 
-    log "warning: this function is still not working."
-
     keyID="$1"
 
     gpgOut=$(gpg --fixed-list-mode --list-keys --with-colons \
@@ -60,8 +58,7 @@ gen_subkey(){
 
     # return 1 if there only "tru" lines are output from gpg
     if [ -z "$(echo "$gpgOut" | grep -v '^tru:')" ] ; then
-	log "  key not found."
-	return 1
+	failure "Key ID '$keyID' not found."
     fi
 
     # set subkey defaults
@@ -171,7 +168,7 @@ case $COMMAND in
 	for userID ; do
 	    update_userid "$userID" "$userKeysCacheDir"
 	done
-	log "run the following to update your monkeysphere authorized_keys file:"
+	log "Run the following to update your monkeysphere authorized_keys file:"
 	log "$PGRM update-authorized_keys"
 	;;
 
@@ -182,7 +179,7 @@ case $COMMAND in
 	for userID ; do
 	    remove_userid "$userID"
 	done
-	log "run the following to update your monkeysphere authorized_keys file:"
+	log "Run the following to update your monkeysphere authorized_keys file:"
 	log "$PGRM update-authorized_keys"
 	;;
 
@@ -204,7 +201,7 @@ case $COMMAND in
     'gen-subkey'|'g')
 	keyID="$1"
 	if [ -z "$keyID" ] ; then
-	    failure "you must specify keyid of primary key."
+	    failure "You must specify the key ID of your primary key."
 	fi
 	gen_subkey "$keyID"
 	;;