add craigt, make more resilient

diff --git a/fsf-keyring.gpg b/fsf-keyring.gpg
index 64e6cc5a612f07821bd5a00a4ab4e4211df619ee..794eb1ff2832eeacc3166db2bc9b040dbb61884d 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 36939235040b60b3584f3ac7739d9861b5213c6b..24066dcf645fab3a9cf11fc5e9c6db404b6d36f3 100755 (executable)
--- a/fsf-keyring.sh
+++ b/fsf-keyring.sh
@@ -36,6 +36,7 @@ KEYS+="05EF1D2FFE61747D1FC827C37FAC7D26472F4409 " #ruben
 KEYS+="0CCB3494C13CCD8F6EC73AA06DA6B7D151C7643E " #dana
 KEYS+="B125F60B7B287FF6A2B7DF8F170AF0E2954295DF " #ian
 KEYS+="ECE5B5BF952A3AEA92C137F9C9230A4849ACE0DB " #molly
+KEYS+="36C9950D2F68254ED89C7C03F9C13A10581AB853 " #craigt
 KEYS+="E9A271C071964891AA57663D9EA33414F5852F4E " #mako
 KEYS+="A2F4F1966D9E35C673EC30D5B6F1D83E9ACD9EBB " #bkuhn
 KEYS+="2C31130BF7D5A459AFF2A3F3C9DFFE4A33AA52D9 " #knauth
@@ -43,12 +44,12 @@ KEYS+="2C31130BF7D5A459AFF2A3F3C9DFFE4A33AA52D9 " #knauth
 rm -f /tmp/keys.asc ./fsf-keyring.gpg
 
 for KEY in $KEYS ; do
-  refresh-gpg-key $KEY
+  #refresh-gpg-key $KEY
   gpg --export --armor $KEY >> /tmp/keys.asc
 done
 
-# TODO: this doesn't work with gpg2. i dunno what the equivalent is, likely just exporting
-# all the keys.
-gpg --trust-model always --no-default-keyring --keyring ./fsf-keyring.gpg --import /tmp/keys.asc
+# 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
 gpg --sign ./fsf-keyring.gpg
 mv fsf-keyring.gpg.gpg fsf-keyring.gpg