diff options
| author | Andrew Gregory <andrew.gregory.8@gmail.com> | 2018-01-13 11:50:00 -0500 |
|---|---|---|
| committer | Allan McRae <allan@archlinux.org> | 2018-01-19 12:02:11 +1000 |
| commit | d9eda13fc69eb0bfbbab6d7488e99e5c7b033d3a (patch) | |
| tree | 681851b33b419c35171825f5eb5b5112cb4f8a43 /scripts/pacman-key.sh.in | |
| parent | 170bb80a1f8a020595738c7febdb15c68574ce29 (diff) | |
| download | pacman-d9eda13fc69eb0bfbbab6d7488e99e5c7b033d3a.tar.xz | |
use pacman-conf in scripts
Because parsing pacman.conf is so difficult that even we can't do it
right.
Signed-off-by: Andrew Gregory <andrew.gregory.8@gmail.com>
Signed-off-by: Allan McRae <allan@archlinux.org>
Diffstat (limited to 'scripts/pacman-key.sh.in')
| -rw-r--r-- | scripts/pacman-key.sh.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/pacman-key.sh.in b/scripts/pacman-key.sh.in index 7b158da7..293a42de 100644 --- a/scripts/pacman-key.sh.in +++ b/scripts/pacman-key.sh.in @@ -580,7 +580,7 @@ fi # if PACMAN_KEYRING_DIR isn't assigned, try to get it from the config # file, falling back on a hard default -PACMAN_KEYRING_DIR=${PACMAN_KEYRING_DIR:-$(get_from "$CONFIG" "GPGDir" "@sysconfdir@/pacman.d/gnupg")} +PACMAN_KEYRING_DIR=${PACMAN_KEYRING_DIR:-$(pacman-conf --config="$CONFIG" gpgdir)} GPG_PACMAN=(gpg --homedir "${PACMAN_KEYRING_DIR}" --no-permission-warning) if [[ -n ${KEYSERVER} ]]; then |