diff options
| author | Björn Mattsson <bjorn@sunet.se> | 2023-02-23 09:55:23 +0100 |
|---|---|---|
| committer | Björn Mattsson <bjorn@sunet.se> | 2023-02-23 09:55:23 +0100 |
| commit | 8ac356f5757f7daba51415df1bb10db86fb9b33a (patch) | |
| tree | 961b58237927586b018cc0531fe88193a1158e1b | |
| parent | f1d843c743efdd1fea42ffe75d5fe735a705dab6 (diff) | |
Select gpg based on Distfidus-metadata-2023-02-23-v02
| -rwxr-xr-x | scripts/update-trust | 6 | ||||
| -rwxr-xr-x | scripts/verify-tag | 8 |
2 files changed, 11 insertions, 3 deletions
diff --git a/scripts/update-trust b/scripts/update-trust index 9ff7e78..3485bdf 100755 --- a/scripts/update-trust +++ b/scripts/update-trust @@ -3,7 +3,11 @@ export GNUPGHOME=/etc/metadata/gnupg mkdir -p $GNUPGHOME chmod 0700 $GNUPGHOME -export GPG=gpg2 +if [ $(lsb_release -is) == 'Debian' ]; then + export GPG=gpg +else + export GPG=gpg2 +fi # Install new keys discovered in the keys directory for k in keys/*.pub; do diff --git a/scripts/verify-tag b/scripts/verify-tag index cadaefc..7275ba7 100755 --- a/scripts/verify-tag +++ b/scripts/verify-tag @@ -2,9 +2,13 @@ export GNUPGHOME=/etc/metadata/gnupg mkdir -p $GNUPGHOME -#export GPG=gpg2 +if [ $(lsb_release -is) == 'Debian' ]; then + export GPG=gpg +else + export GPG=gpg2 +fi -#git config --global gpg.program gpg2 +git config --global gpg.program $GPG tag=$(git tag -l "fidus-metadata-[0-9]*" | sort | tail -1) if [ -z "$tag" ]; then |