bug fixes

diff --git a/fsf-keyring.sh b/fsf-keyring.sh
index a49ba6445c3b6e76f984c602150a4829343ba3fb..d1588c41fa9031f3133b3d50194a5f47e7dc237c 100755 (executable)
--- a/fsf-keyring.sh
+++ b/fsf-keyring.sh
@@ -63,22 +63,22 @@ KEYS+="3D53198D2A8341B291BDD42893C0CF451883524B " #davis
 KEYS+="2E0ECE75F8162B407D666767879738E6D6440D57 " #devinu
 KEYS+="D86097B5E291BA771FA64D357014A6BE08494155"  #odile
 
-check-sig-dos fsf-keyring.gpg
-gpg --import fsf-keyring.gpg
-
-rm -f /tmp/keys.asc ./fsf-keyring.gpg
+if [[ -e fsf-keyring.gpg ]] ; then
+  check-sig-dos fsf-keyring.gpg
+  gpg --import fsf-keyring.gpg
+else
+  gpg --armor --export $KEYS > fsf-keyring.gpg
+fi
 
 for KEY in $KEYS ; do
   if $refresh; then
     echo "Key: $KEY"
-    refresh-gpg-key $KEY
+    refresh-gpg-key $KEY || :
   fi
 done
 
 gpg --armor --export $KEYS > key-export
-
 check-sig-dos key-export
-
 mv key-export fsf-keyring.gpg
 
 rm -f fsf-keyring.gpg.asc ./fsf-keyring.gpg~ key-export