add no-tty, quiet, and no-greeting to gpg wrapper invocations to supress as much gpg output as possible. then cleanup gpg invocations.

1 files changed, 4 insertions, 7 deletions

diff --git a/src/monkeysphere-host b/src/monkeysphere-host
index c7e011b..7e8dd27 100755
--- a/src/monkeysphere-host
+++ b/src/monkeysphere-host
@@ -77,7 +77,7 @@ EOF
 
 # function to interact with the gpg keyring
 gpg_host() {
-    GNUPGHOME="$GNUPGHOME_HOST" gpg "$@"
+    GNUPGHOME="$GNUPGHOME_HOST" gpg --no-greeting --quiet --no-tty "$@"
 }
 
 # command to list the info about the host key, in colon format, to
@@ -93,9 +93,7 @@ gpg_host_list() {
 # FIXME: should we supress all the edit script spew?  or pipe it
 # through log debug?
 gpg_host_edit() {
-    gpg_host --no-greeting --quiet \
-	--command-fd 0 --no-tty --edit-key \
-	"0x${HOST_FINGERPRINT}!" "$@" 2>&1 | log debug
+    gpg_host --command-fd 0 --edit-key "0x${HOST_FINGERPRINT}!" "$@"
 }
 
 # export the host public key to the monkeysphere gpg pub key file
@@ -127,8 +125,7 @@ load_fingerprint() {
 # gpg host secret key
 load_fingerprint_secret() {
     HOST_FINGERPRINT=$( \
-	gpg_host --quiet --list-secret-key \
-	--with-colons --with-fingerprint \
+	gpg_host --list-secret-key --with-colons --with-fingerprint \
 	| grep '^fpr:' | cut -d: -f10 )
 }
 
@@ -142,7 +139,7 @@ check_host_key() {
 check_host_no_key() {
     [ -s "$HOST_KEY_FILE" ] \
 	|| failure "You don't appear to have a Monkeysphere host key on this server.
-Please run 'monkeysphere-host import-key' first."
+Please run 'monkeysphere-host import-key...' first."
 }
 
 # output the index of a user ID on the host key