Add Anouk. Remove Savvy and Andrew"

[fsf-keyring.git] / fsf-keyring.sh

diff --git a/fsf-keyring.sh b/fsf-keyring.sh
index 38d6ce11a89e0ac2aa37136532558a99d5532c66..595345a320e7fe224756724bc502821a9b96e503 100755 (executable)
--- a/fsf-keyring.sh
+++ b/fsf-keyring.sh
@@ -17,6 +17,7 @@ refresh-gpg-key() {
   key=$1
 
   error=999
+  # johns is the only one in keyring.debian.org at this time.
   for keyserver in keyring.debian.org keyserver.ubuntu.com pgp.mit.edu; do
     echo "Trying $keyserver..."
     set +e
@@ -51,7 +52,6 @@ fi
 KEYS+="67819B343B2AB70DED9320872C6464AF2A8E4C02 " #rms
 KEYS+="A4626CBAFF376039D2D7554497BA9CE761A0963B " #johns
 KEYS+="759C0A4A39A02A079712FB5061B826E87A80C8D6 " #johnh
-KEYS+="1487E002421112A3B6C76B545FA66D3CA7518DBF " #andrew
 KEYS+="8556112E9B88B1A8B3E3631B58A39239D50484E8 " #jeanne
 KEYS+="B125F60B7B287FF6A2B7DF8F170AF0E2954295DF " #ian
 KEYS+="36C9950D2F68254ED89C7C03F9C13A10581AB853 " #craigt
@@ -62,7 +62,8 @@ KEYS+="7CCC7ECD3D78EB384F6C02C8966951617A149C73 " #gregf
 KEYS+="2E0ECE75F8162B407D666767879738E6D6440D57 " #devinu
 KEYS+="005D03724A11C08A5A353D2C906DB6E398AA6CF6 " #miriam
 KEYS+="2D1304056F4F061DADEAE299A2C76C5425EF14E8 " #dawn
-KEYS+="5629EDBC6F32BDF1CD84B2C2592D779F4F161F0F " #savvy
+KEYS+="476B712A9FA8788EDA2089F78B656B4E5A98CE74 " #anouk
+#KEYS+="2985A29A7ECF1679063A4D5659EB02F5619B3C7E " #krzyzstof # Needs verbal confirmation and contract.
 KEYS+="D86097B5E291BA771FA64D357014A6BE08494155"  #odile
 
 if [[ -e fsf-keyring.gpg ]] ; then
@@ -83,5 +84,9 @@ gpg --export $KEYS > key-export
 check-sig-dos key-export
 mv key-export fsf-keyring.gpg
 
+# Clean up
 rm -f fsf-keyring.gpg.asc ./fsf-keyring.gpg~ key-export
+
+echo -e "You will now sign the keyring. Prepare your GPG password.\n"
+read -p "Press any key to continue..." -n1 -s
 gpg --armor --detach-sign ./fsf-keyring.gpg