From 13a2847aa14cb7643d50ca82b00180b440e401fe Mon Sep 17 00:00:00 2001
From: Dan McGee <dan@archlinux.org>
Date: Sun, 12 Dec 2010 21:40:24 -0600
Subject: pacman-optimize: ensure database directory contains local/
And also default dbpath to the one we may find in pacman.conf.
Signed-off-by: Dan McGee <dan@archlinux.org>
---
scripts/pacman-optimize.sh.in | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
(limited to 'scripts')
diff --git a/scripts/pacman-optimize.sh.in b/scripts/pacman-optimize.sh.in
index f4642abf..2404291e 100644
--- a/scripts/pacman-optimize.sh.in
+++ b/scripts/pacman-optimize.sh.in
@@ -25,7 +25,9 @@ export TEXTDOMAIN='pacman'
export TEXTDOMAINDIR='@localedir@'
myver='@PACKAGE_VERSION@'
-dbroot='@localstatedir@/lib/pacman/'
+
+eval $(awk '/DBPath/ {print $1$2$3}' @sysconfdir@/pacman.conf)
+dbroot="${DBPath:-@localstatedir@/lib/pacman/}"
msg() {
local mesg=$1; shift
@@ -99,7 +101,7 @@ if ! type diff >/dev/null 2>&1; then
die "$(gettext "diff tool was not found, please install diffutils.")"
fi
-if [[ ! -d $dbroot ]]; then
+if [[ ! -d $dbroot || ! -d $dbroot/local ]]; then
die "$(gettext "%s does not exist or is not a directory.")" "$dbroot"
fi
--
cgit v1.2.3-2-g168b