update keyring and script for t9

diff --git a/fsf-keyring.gpg b/fsf-keyring.gpg
index 969cf58aab896e41f74d983bafd44c9ddfa1caa3..a1117db56fd162457e566ea66c9e1bbe2c4c6152 100644 (file)
Binary files a/fsf-keyring.gpg and b/fsf-keyring.gpg differ

diff --git a/fsf-keyring.sh b/fsf-keyring.sh
index 8878e19b86d66c3a8dce9ec1cedd41d2e6e27d2a..a8478bb19b6da772d1d46d637d2299471a795d23 100755 (executable)
--- a/fsf-keyring.sh
+++ b/fsf-keyring.sh
@@ -19,7 +19,8 @@ refresh-gpg-key() {
     for x in {1..3}; do
       $cmd &>/dev/null
       ret=$?
-      if (( ret == 0 )); then break; fi
+      if (( ret == 0 )); then
+        break; fi
       sleep 1
     done
     set -e
@@ -58,13 +59,10 @@ for KEY in $KEYS ; do
   if $refresh; then
     refresh-gpg-key $KEY
   fi
-  gpg2 --export --armor $KEY >> /tmp/keys.asc
 done
 
-# note: this doesn't work with gpg2. i dunno what the equivalent is in
-# gpg2, likely just exporting all the keys.
-command gpg --trust-model always --no-default-keyring --keyring ./fsf-keyring.gpg --import /tmp/keys.asc
-echo
+gpg2 --export $KEYS > fsf-keyring.gpg
+
 echo "Please verify in another terminal window that the keyring doesn't contain many spam signatures before signing:"
 echo
 echo "gpg2 --no-default-keyring --keyring=./fsf-keyring.gpg --list-sigs | less"
@@ -74,4 +72,4 @@ echo
 read
 gpg2 --sign ./fsf-keyring.gpg
 mv fsf-keyring.gpg.gpg fsf-keyring.gpg
-rm fsf-keyring.gpg~
+rm -f fsf-keyring.gpg~