diff options
| author | Jameson Graef Rollins <jrollins@finestructure.net> | 2009-02-17 23:13:31 -0500 |
|---|---|---|
| committer | Jameson Graef Rollins <jrollins@finestructure.net> | 2009-02-17 23:13:31 -0500 |
| commit | c1924de73702d0f999a44bc63df9bee0d432636a (patch) | |
| tree | 0f3ef7031c6a30a30e2c6aefac204d9cd67a7e12 /src/monkeysphere-host | |
| parent | 79c139755848692f514080c470fcba3f48b77112 (diff) | |
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.
Diffstat (limited to 'src/monkeysphere-host')
| -rwxr-xr-x | src/monkeysphere-host | 7 |
1 files changed, 4 insertions, 3 deletions
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 |