From 7cebec9450bced4907865759edd51f72c7291d66 Mon Sep 17 00:00:00 2001
From: Ben Tullis <ben.tullis@opencorporates.com>
Date: Wed, 11 Apr 2018 11:06:14 +0100
Subject: [PATCH] Ensure that git commits the changes to pubring.gpg when
 running blackbox_removeadmin

This relates to https://github.com/StackExchange/blackbox/issues/247 where it has been observed that the blackbox_removeadmin script prompts the user to run an incorrect command after running blackbox_removeadmin. This commit simply adds pubring.gpg to the list of files to be committed.
---
 bin/blackbox_removeadmin | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/blackbox_removeadmin b/bin/blackbox_removeadmin
index ddd1fb3..3a36e5e 100755
--- a/bin/blackbox_removeadmin
+++ b/bin/blackbox_removeadmin
@@ -31,4 +31,4 @@ vcs_add "$pubring_path" "$KEYRINGDIR/trustdb.gpg" "$BB_ADMINS"
 echo
 echo
 echo 'NEXT STEP: Check these into the repo.  Probably with a command like...'
-echo $VCS_TYPE commit -m\'REMOVED ADMIN: $KEYNAME\' "$BLACKBOXDATA/trustdb.gpg" "$BLACKBOXDATA/$BB_ADMINS_FILE"
+echo $VCS_TYPE commit -m\'REMOVED ADMIN: $KEYNAME\' "$BLACKBOXDATA/$(basename ${pubring_path})" "$BLACKBOXDATA/trustdb.gpg" "$BLACKBOXDATA/$BB_ADMINS_FILE"