From e7759f7303bd5691510739c4d540790459b75416 Mon Sep 17 00:00:00 2001 From: Daniel Langbein Date: Sun, 6 Nov 2022 11:19:13 +0100 Subject: [PATCH] fix de-p1st-gnupg --- pkg/de-p1st-gnupg/99_import_pubkey.sh | 10 ++++------ pkg/de-p1st-gnupg/PKGBUILD | 2 +- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/pkg/de-p1st-gnupg/99_import_pubkey.sh b/pkg/de-p1st-gnupg/99_import_pubkey.sh index dd42650..817c6f9 100644 --- a/pkg/de-p1st-gnupg/99_import_pubkey.sh +++ b/pkg/de-p1st-gnupg/99_import_pubkey.sh @@ -1,5 +1,7 @@ -function import-pubkey() { - # echo to stderr +if ! gpg --export-ownertrust | grep --quiet '^94F3D3DDAC22802258FC044B6C47C753F0823002:6:$'; then + # Import public key. + + # Write to stderr. echo "Importing public key ..." >&2 gpg --import /usr/share/gnupg/94F3D3DDAC22802258FC044B6C47C753F0823002.pub || { @@ -10,8 +12,4 @@ function import-pubkey() { echo "p1st: Error changing trust!" return 1; } -} - -if ! gpg --export-ownertrust | grep --quiet '^94F3D3DDAC22802258FC044B6C47C753F0823002:6:$'; then - import-pubkey fi diff --git a/pkg/de-p1st-gnupg/PKGBUILD b/pkg/de-p1st-gnupg/PKGBUILD index 203177e..140e58f 100644 --- a/pkg/de-p1st-gnupg/PKGBUILD +++ b/pkg/de-p1st-gnupg/PKGBUILD @@ -2,7 +2,7 @@ _pkgname=gnupg _reponame=arch pkgname="de-p1st-$_pkgname" -pkgver=0.0.10 +pkgver=0.0.11 pkgrel=1 pkgdesc="gnupg with configuration" arch=('any')