moparisthebest/pacman
1
0
Fork 0
mirror of https://github.com/moparisthebest/pacman synced 2024-12-23 00:08:50 -05:00
Code Issues Releases Wiki Activity

pacman-key: move --edit-key and --receive processing to functions

Browse Source 
This moves the processing of the --edit-key and --receive options
to functions, keeping the final option processing to be all single
line statements.

Also rework the --edit-key option to validate all input before
processing.

Signed-off-by: Allan McRae <allan@archlinux.org>
This commit is contained in:
Allan McRae 2011-07-09 11:07:29 +10:00
parent 7963c5d000
commit 74e5a494b0
1 changed files with 26 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
scripts/pacman-key.sh.in
View File

@ -202,6 +202,30 @@ reload_keyring() {
${GPG_PACMAN} --batch --check-trustdb ${GPG_PACMAN} --batch --check-trustdb
} }
receive_keys() {
if [[ -z ${KEYIDS[@]} ]]; then
error "$(gettext "You need to specify the keyserver and at least one key identifier")"
exit 1
fi
${GPG_PACMAN} --keyserver "$KEYSERVER" --recv-keys "${KEYIDS[@]}"
}
edit_keys() {
local errors=0;
for key in ${KEYIDS[@]}; do
# Verify if the key exists in pacman's keyring
if ! ${GPG_PACMAN} --list-keys "$key" &>/dev/null; then
error "$(gettext "The key identified by %s does not exist")" "$key"
errors=1;
fi
done
(( errors )) && exit 1;
for key in ${KEYIDS[@]}; do
${GPG_PACMAN} --edit-key "$key"
done
}
# PROGRAM START # PROGRAM START
if ! type gettext &>/dev/null; then if ! type gettext &>/dev/null; then
gettext() { gettext() {
@ -279,31 +303,12 @@ GPG_PACMAN="gpg --homedir ${PACMAN_KEYRING_DIR} --no-permission-warning"
(( ADD )) && ${GPG_PACMAN} --quiet --batch --import "${KEYFILES[@]}" (( ADD )) && ${GPG_PACMAN} --quiet --batch --import "${KEYFILES[@]}"
(( DELETE )) && ${GPG_PACMAN} --quiet --batch --delete-key --yes "${KEYIDS[@]}" (( DELETE )) && ${GPG_PACMAN} --quiet --batch --delete-key --yes "${KEYIDS[@]}"
(( EDITKEY )) && edit_keys
(( EXPORT )) && ${GPG_PACMAN} --armor --export "${KEYIDS[@]}" (( EXPORT )) && ${GPG_PACMAN} --armor --export "${KEYIDS[@]}"
(( FINGER )) && ${GPG_PACMAN} --batch --fingerprint "${KEYIDS[@]}" (( FINGER )) && ${GPG_PACMAN} --batch --fingerprint "${KEYIDS[@]}"
(( LIST )) && ${GPG_PACMAN} --batch --list-sigs "${KEYIDS[@]}" (( LIST )) && ${GPG_PACMAN} --batch --list-sigs "${KEYIDS[@]}"
(( RECEIVE )) && receive_keys
(( RELOAD )) && reload_keyring (( RELOAD )) && reload_keyring
(( UPDATEDB )) && ${GPG_PACMAN} --batch --check-trustdb (( UPDATEDB )) && ${GPG_PACMAN} --batch --check-trustdb
if (( RECEIVE )); then
if [[ -z ${KEYIDS[@]} ]]; then
error "$(gettext "You need to specify the keyserver and at least one key identifier")"
exit 1
fi
${GPG_PACMAN} --keyserver "$KEYSERVER" --recv-keys "${KEYIDS[@]}"
fi
if (( EDITKEY )); then
for key in ${KEYIDS[@]}; do
# Verify if the key exists in pacman's keyring
if ${GPG_PACMAN} --list-keys "$key" &>/dev/null; then
${GPG_PACMAN} --edit-key "$key"
else
error "$(gettext "The key identified by %s does not exist")" "$key"
exit 1
fi
shift
done
fi
# vim: set ts=2 sw=2 noet: # vim: set ts=2 sw=2 noet: