general improvements

diff --git a/t/lib-gpg.sh b/t/lib-gpg.sh
index 3fe02876c1fc7e4f7488c1534a4745f5760f1ca0..8d28652b729b46cb08de8ddd4347dddda9e246a7 100755 (executable)
--- a/t/lib-gpg.sh
+++ b/t/lib-gpg.sh
@@ -57,11 +57,13 @@ then
                echo | gpgsm --homedir "${GNUPGHOME}" 2>/dev/null \
                        --passphrase-fd 0 --pinentry-mode loopback \
                        --import "$TEST_DIRECTORY"/lib-gpg/gpgsm_cert.p12 &&
-               gpgsm --homedir "${GNUPGHOME}" 2>/dev/null -K \
-                       | grep fingerprint: | cut -d" " -f4 | tr -d '\n' > \
-                       ${GNUPGHOME}/trustlist.txt &&
-               echo " S relax" >> ${GNUPGHOME}/trustlist.txt &&
-               (gpgconf --kill gpg-agent >/dev/null 2>&1 || : ) &&
+
+               gpgsm --homedir "${GNUPGHOME}" 2>/dev/null -K |
+               grep fingerprint: |
+               cut -d" " -f4 |
+               tr -d '\n' >"${GNUPGHOME}/trustlist.txt" &&
+
+               echo " S relax" >>"${GNUPGHOME}/trustlist.txt" &&
                echo hello | gpgsm --homedir "${GNUPGHOME}" >/dev/null \
                        -u committer@example.com -o /dev/null --sign - 2>&1 &&
                test_set_prereq GPGSM