summaryrefslogtreecommitdiff
path: root/src/abslibre-tools/libredbdiff
diff options
context:
space:
mode:
Diffstat (limited to 'src/abslibre-tools/libredbdiff')
-rwxr-xr-xsrc/abslibre-tools/libredbdiff33
1 files changed, 12 insertions, 21 deletions
diff --git a/src/abslibre-tools/libredbdiff b/src/abslibre-tools/libredbdiff
index 2617323..50bc78f 100755
--- a/src/abslibre-tools/libredbdiff
+++ b/src/abslibre-tools/libredbdiff
@@ -19,8 +19,12 @@ name="Libredbdiff"
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-baseconfpath="/etc/libredbdiff"
-basedbpath="/var/lib/libredbdiff"
+. "$(librelib messages)"
+. "$(librelib conf)"
+load_files libredbdiff || exit 1
+
+baseconfpath="$statedir"
+basedbpath="$statedir"
conffile="$baseconfpath/pacman.conf.parabola"
conffilearch="$baseconfpath/pacman.conf.archlinux"
@@ -31,17 +35,11 @@ dbpatharch="$basedbpath/pacman.archlinux"
mirrorlist="$baseconfpath/mirrorlist.parabola"
mirrorlistarch="$baseconfpath/mirrorlist.archlinux"
-mirror='http://repo.parabola.nu/$repo/os/$arch'
-mirrorarch='http://mirrors.kernel.org/archlinux/$repo/os/$arch'
-
repos="libre pcr libre-multilib nonprism"
field_pkgname_parabola=30
field_pkgname_arch=30
-
-. "$(librelib messages)"
-
cmd="${0##*/}"
arch_packages_tmp="/tmp/${cmd}.arch-packages"
@@ -276,6 +274,7 @@ main() {
"$name" \
"$cmd"
fi
+ check_vars libredbdiff statedir mirror mirrorarch || exit 1
if ! [[ -e "${conffile}" && \
-e "${conffilearch}" && \
@@ -305,31 +304,23 @@ main() {
createdir "$dbpatharch"
msg "Synchronizing %s pacman databases for Arch" "$name"
- pacman --config "${conffilearch}" -b "${dbpatharch}" -Sy ||
+ pacman --config "${conffilearch}" -Sy ||
die "Failed to synchronize pacman database for Arch. Exiting."
msg "%s pacman databases are updated. %s is ready. Run %q -n to print results." \
"$name" "$name" "$cmd"
return 0
else
- filenotfound "${dbpath}"
- filenotfound "${dbpatharch}"
+ check_vars libredbdiff statedir || exit 1
+
+ filenotfound "${dbpath}/sync/libre.db"
+ filenotfound "${dbpatharch}/sync/core.db"
filenotfound "${conffile}"
filenotfound "${conffilearch}"
- filenotfound "${mirrorlist}"
- filenotfound "${mirrorlistarch}"
unset provides ver verarch
declare -gA provides ver verarch
- if ! [[ -d "$dbpath" && \
- -d "$dbpatharch" ]]; then
- die "At least one %s pacman DB directory is missing. To update %s pacman databases, %s must be run as root. Nothing done." \
- "$name" \
- "$name" \
- "$cmd"
- fi
-
pacman --config "${conffilearch}" -Ss | \
grep -v '^ ' | \
awk -F/ '{print $2}' \