From c1924de73702d0f999a44bc63df9bee0d432636a Mon Sep 17 00:00:00 2001
From: Jameson Graef Rollins <jrollins@finestructure.net>
Date: Tue, 17 Feb 2009 23:13:31 -0500
Subject: fix ma so that the setup command is folded into the other commands,
so it's never needed to be run manually, and can therefore be supressed in
the usage/documentation. Also, add setup to the postinst script so that it's
setup on installation. Also add pipefail to ma, and try to supress
unnecessary gpg output, and redirect other to log debug.
---
src/monkeysphere-host | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
(limited to 'src/monkeysphere-host')
diff --git a/src/monkeysphere-host b/src/monkeysphere-host
index 11121cc..3bee007 100755
--- 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,8 @@ 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 --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
--
cgit v1.2.3