fix some log output

[monkeysphere.git] / src / monkeysphere-host

diff --git a/src/monkeysphere-host b/src/monkeysphere-host
index 2dc6003c6cdd7904ad413ba3789681f80afd4991..c7e011b6b1f759513c074e82c6290d8c7685c6b5 100755 (executable)
--- a/src/monkeysphere-host
+++ b/src/monkeysphere-host
@@ -80,7 +80,8 @@ gpg_host() {
     GNUPGHOME="$GNUPGHOME_HOST" gpg "$@"
 }
 
-# command to list the info about the host key, in colon format
+# command to list the info about the host key, in colon format, to
+# stdout
 gpg_host_list() {
     gpg_host --list-keys --with-colons --fixed-list-mode \
        --with-fingerprint --with-fingerprint \
@@ -92,8 +93,9 @@ gpg_host_list() {
 # FIXME: should we supress all the edit script spew?  or pipe it
 # through log debug?
 gpg_host_edit() {
-    gpg_host --quiet --command-fd 0 --edit-key \
-       "0x${HOST_FINGERPRINT}!" "$@"
+    gpg_host --no-greeting --quiet \
+       --command-fd 0 --no-tty --edit-key \
+       "0x${HOST_FINGERPRINT}!" "$@" 2>&1 | log debug
 }
 
 # export the host public key to the monkeysphere gpg pub key file
@@ -209,7 +211,7 @@ show_key() {
 # MAIN
 ########################################################################
 
-# unset variables that should be defined only in config file of in
+# unset variables that should be defined only in config file or in
 # MONKEYSPHERE_ variables
 unset LOG_LEVEL
 unset KEYSERVER