7cebec9450
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.
35 lines
933 B
Bash
Executable File
35 lines
933 B
Bash
Executable File
#!/usr/bin/env bash
|
|
|
|
#
|
|
# blackbox_removeadmin -- Remove an admin to the system
|
|
# NOTE: Does not remove admin from the keyring.
|
|
#
|
|
|
|
# Example:
|
|
# blackbox_removeadmin tal@example.com
|
|
#
|
|
|
|
set -e
|
|
source "${0%/*}/_blackbox_common.sh"
|
|
|
|
fail_if_not_in_repo
|
|
|
|
KEYNAME="$1"
|
|
: "${KEYNAME:?ERROR: First argument must be a keyname (email address)}" ;
|
|
|
|
# Remove the email address from the BB_ADMINS file.
|
|
remove_line "$BB_ADMINS" "$KEYNAME"
|
|
|
|
|
|
# remove the admin key from the pubring
|
|
$GPG --no-permission-warning --homedir="$KEYRINGDIR" --batch --yes --delete-key "$KEYNAME" || true
|
|
pubring_path=$(get_pubring_path)
|
|
vcs_add "$pubring_path" "$KEYRINGDIR/trustdb.gpg" "$BB_ADMINS"
|
|
|
|
|
|
# Make a suggestion:
|
|
echo
|
|
echo
|
|
echo 'NEXT STEP: Check these into the repo. Probably with a command like...'
|
|
echo $VCS_TYPE commit -m\'REMOVED ADMIN: $KEYNAME\' "$BLACKBOXDATA/$(basename ${pubring_path})" "$BLACKBOXDATA/trustdb.gpg" "$BLACKBOXDATA/$BB_ADMINS_FILE"
|