Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/scripts/pacman-db-upgrade.sh.in
diff options
context:
space:
mode:
Diffstat (limited to 'scripts/pacman-db-upgrade.sh.in')
-rw-r--r--scripts/pacman-db-upgrade.sh.in21
1 files changed, 2 insertions, 19 deletions
diff --git a/scripts/pacman-db-upgrade.sh.in b/scripts/pacman-db-upgrade.sh.in
index a6ff3b25..0629cc1c 100644
--- a/scripts/pacman-db-upgrade.sh.in
+++ b/scripts/pacman-db-upgrade.sh.in
@@ -70,18 +70,6 @@ die_r() {
die "$@"
}
-get_opt_from_config() {
- local keyname="$1" conffile="$2"
- local key value
-
- while IFS=$'= \t' read -r key value _; do
- if [[ $key = $keyname ]]; then
- echo "$value"
- return
- fi
- done <"$conffile"
-}
-
resolve_dir() {
local d="$(cd "$1"; pwd -P)"
[[ $d == */ ]] || d+=/
@@ -121,13 +109,8 @@ while true; do
done
conffile=${conffile:-@sysconfdir@/pacman.conf}
-[[ -z $pacroot ]] && pacroot="$(get_opt_from_config "RootDir" "$conffile")"
-[[ -z $dbroot ]] && dbroot="$(get_opt_from_config "DBPath" "$conffile")"
-
-[[ -z $dbroot && -n $pacroot ]] && dbroot="$pacroot/@localstatedir@/lib/pacman"
-
-[[ -z $pacroot ]] && pacroot="@rootdir@"
-[[ -z $dbroot ]] && dbroot="@localstatedir@/lib/pacman/"
+[[ -z $pacroot ]] && pacroot=$(pacman-conf --config="$conffile" rootdir)
+[[ -z $dbroot ]] && dbroot=$(pacman-conf --config="$conffile" --rootdir="$pacroot" dbpath)
m4_include(library/term_colors.sh)