X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=src%2Fmonkeysphere-authentication;h=e8b11a40ea0c60b0a022c65379e6db9cc5b034a4;hb=f02e0df059f0985cc00e41554cf26b3cb4efa3c1;hp=8a4146f36c9df4a2fa1f417d29dd9532a6117c1e;hpb=278c20f82d2ee0954a04b8daae5cbc2788c0015c;p=monkeysphere.git diff --git a/src/monkeysphere-authentication b/src/monkeysphere-authentication index 8a4146f..e8b11a4 100755 --- a/src/monkeysphere-authentication +++ b/src/monkeysphere-authentication @@ -75,7 +75,7 @@ gpg_core() { GNUPGHOME="$GNUPGHOME_CORE" export GNUPGHOME - gpg "$@" + gpg --no-greeting --quiet --no-tty "$@" } # function to interact with the gpg sphere keyring @@ -85,15 +85,15 @@ gpg_sphere() { GNUPGHOME="$GNUPGHOME_SPHERE" export GNUPGHOME - su_monkeysphere_user "gpg $@" + su_monkeysphere_user "gpg --no-greeting --no-tty $@" } # output to stdout the core fingerprint from the gpg core secret # keyring core_fingerprint() { log debug "determining core key fingerprint..." - gpg_core --quiet --list-secret-key \ - --with-colons --fixed-list-mode --with-fingerprint \ + gpg_core --list-secret-key --with-colons \ + --fixed-list-mode --with-fingerprint \ | grep ^fpr: | cut -d: -f10 } @@ -101,8 +101,7 @@ core_fingerprint() { gpg_core_sphere_sig_transfer() { log debug "exporting core local sigs to sphere..." gpg_core --export-options export-local-sigs --export | \ - gpg_sphere "--import-options import-local-sigs --import" \ - 2>&1 | log debug + gpg_sphere "--import-options import-local-sigs --import" } ########################################################################