From: Ian Kelling <iank@fsf.org> Date: Mon, 12 Nov 2018 22:37:56 +0000 (-0500) Subject: reenable key refresh X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=e72d434bf810feeaa817f1a7ed6e227b7eb9d147;p=fsf-keyring.git reenable key refresh --- diff --git a/fsf-keyring.gpg b/fsf-keyring.gpg index 794eb1f..2f1f473 100644 Binary files a/fsf-keyring.gpg and b/fsf-keyring.gpg differ diff --git a/fsf-keyring.sh b/fsf-keyring.sh index 24066dc..073cb60 100755 --- a/fsf-keyring.sh +++ b/fsf-keyring.sh @@ -25,6 +25,11 @@ refresh-gpg-key() { return $error } +refresh=true +if [[ $1 == -r ]]; then + refresh=false +fi + KEYS+="67819B343B2AB70DED9320872C6464AF2A8E4C02 " #rms KEYS+="A4626CBAFF376039D2D7554497BA9CE761A0963B " #johns KEYS+="759C0A4A39A02A079712FB5061B826E87A80C8D6 " #johnh @@ -44,7 +49,9 @@ KEYS+="2C31130BF7D5A459AFF2A3F3C9DFFE4A33AA52D9 " #knauth rm -f /tmp/keys.asc ./fsf-keyring.gpg for KEY in $KEYS ; do - #refresh-gpg-key $KEY + if $refresh; then + refresh-gpg-key $KEY + fi gpg --export --armor $KEY >> /tmp/keys.asc done