Currently declared as an array, but expanded as a string.
Signed-off-by: DJ Mills <[email protected]>
---
scripts/pacman-key.sh.in | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/scripts/pacman-key.sh.in b/scripts/pacman-key.sh.in
index 0d3729d..84e47bb 100644
--- a/scripts/pacman-key.sh.in
+++ b/scripts/pacman-key.sh.in
@@ -157,22 +157,22 @@ reload_keyring() {
# be updated automatically.
if [[ -r "${ADDED_KEYS}" ]]; then
msg "$(gettext "Appending official keys...")"
- local add_keys=$(${GPG_NOKEYRING} --keyring "${ADDED_KEYS}"
--with-colons --list-keys | grep ^pub | cut -d: -f5)
+ local add_keys=$("${GPG_NOKEYRING[@]}" --keyring
"${ADDED_KEYS}" --with-colons --list-keys | grep ^pub | cut -d: -f5)
for key_id in ${add_keys}; do
# There is no point in adding a key that will be
deleted right after
if [[ -z "${removed_ids[$key_id]}" ]]; then
- ${GPG_NOKEYRING} --keyring "${ADDED_KEYS}"
--export "${key_id}" | "${GPG_PACMAN[@]}" --import
+ "${GPG_NOKEYRING[@]}" --keyring "${ADDED_KEYS}"
--export "${key_id}" | "${GPG_PACMAN[@]}" --import
fi
done
fi
if [[ -r "${DEPRECATED_KEYS}" ]]; then
msg "$(gettext "Appending deprecated keys...")"
- local add_keys=$(${GPG_NOKEYRING} --keyring
"${DEPRECATED_KEYS}" --with-colons --list-keys | grep ^pub | cut -d: -f5)
+ local add_keys=$("${GPG_NOKEYRING[@]}" --keyring
"${DEPRECATED_KEYS}" --with-colons --list-keys | grep ^pub | cut -d: -f5)
for key_id in ${add_keys}; do
# There is no point in adding a key that will be
deleted right after
if [[ -z "${removed_ids[$key_id]}" ]]; then
- ${GPG_NOKEYRING} --keyring "${DEPRECATED_KEYS}"
--export "${key_id}" | "${GPG_PACMAN[@]}" --import
+ "${GPG_NOKEYRING[@]}" --keyring
"${DEPRECATED_KEYS}" --export "${key_id}" | "${GPG_PACMAN[@]}" --import
fi
done
fi
--
1.7.6
