From: Micah Anderson <micah@riseup.net>
Date: Sat, 31 Jan 2009 22:27:18 +0000 (-0500)
Subject: resyn implementation of m-s gen-key with the help output
X-Git-Tag: monkeysphere_0.23~160^2~1^2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=aaa834da0f1eb3ea52aabc9809dfe3510a159797;p=monkeysphere.git

resyn implementation of m-s gen-key with the help output
---

diff --git a/src/monkeysphere-server b/src/monkeysphere-server
index 2531437..3caa63d 100755
--- a/src/monkeysphere-server
+++ b/src/monkeysphere-server
@@ -406,10 +406,6 @@ gen_key() {
     # get options
     while true ; do
 	case "$1" in
-	    -h|--hostname)
-		hostName="$2"
-		shift 2
-		;;
 	    -l|--length)
 		keyLength="$2"
 		shift 2
@@ -427,6 +423,7 @@ gen_key() {
 		    failure "Unknown option '$1'.
 Type '$PGRM help' for usage."
 		fi
+		hostName="$1"
 		break
 		;;
 	esac
diff --git a/tests/basic b/tests/basic
index 5ba7a25..7fdca39 100755
--- a/tests/basic
+++ b/tests/basic
@@ -8,8 +8,7 @@
 # Copyright: 2008
 # License: GPL v3 or later
 
-# these tests should all be able to
-# as a non-privileged user.
+# these tests should all be able to run as a non-privileged user.
 
 # all subcommands in this script should complete without failure:
 set -e
@@ -193,7 +192,7 @@ echo | monkeysphere-server gen-key --length 1024 --expire 0 testhost
 # remove the gpg.conf
 rm "$MONKEYSPHERE_SYSCONFIGDIR"/gnupg-host/gpg.conf
 
-HOSTKEYID=$( monkeysphere-server show-key | tail -n1 | cut -f3 -d\  )
+HOSTKEYID=$( monkeysphere-server show-key | grep '^OpenPGP fingerprint: ' | cut -f3 -d\  )
 
 # certify it with the "Admin's Key".
 # (this would normally be done via keyservers)