update-keys: extract correct username and include revoked keys in archlinux32.gpg

1 files changed, 2 insertions, 4 deletions

diff --git a/update-keys b/update-keys
index a29ac80..3441d49 100755
--- a/update-keys
+++ b/update-keys
@@ -59,7 +59,7 @@ touch archlinux32-revoked
 
 while read -ra data; do
 	keyid="${data[0]}"
-	username="${data[1]}"
+	username="${data[2]}"
 	${GPG} --recv-keys ${keyid} &>/dev/null
 	printf 'clean\nquit\ny\n' | \
 		${GPG} --command-fd 0 --edit-key ${keyid}
@@ -71,8 +71,6 @@ while read -ra data; do
 	fi
 done < packager-revoked-keyids
 
-# cat master/*.asc packager/*.asc packager-revoked/*.asc > archlinux32.gpg
-
-cat master/*.asc packager/*.asc > archlinux32.gpg
+cat master/*.asc packager/*.asc packager-revoked/*.asc > archlinux32.gpg
 
 popd >/dev/null