From 46798e856bcfa70791e19e7729322ad2f425d157 Mon Sep 17 00:00:00 2001 From: Nicolas Reynolds Date: Tue, 1 Nov 2011 17:16:48 -0300 Subject: PKGBUILD path caching * Toru is overly complex * Moved path caching to toru-path. Run it without arguments to update the PKGBUILD paths cache * Updated fullpkg to check this new paths cache --- toru-path | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100755 toru-path (limited to 'toru-path') diff --git a/toru-path b/toru-path new file mode 100755 index 0000000..82378a4 --- /dev/null +++ b/toru-path @@ -0,0 +1,31 @@ +#!/bin/bash + +source $(dirname $0)/toru-utils + +LASTSYNCFILE=${TORUPATH}/lastsync.paths + +# TODO pass other paths via flags +pkgbuilds=($(get_pkgbuilds ${ABSROOT})) +paths=() +# TODO create a --ignore flag +ignore=($@) + +msg "Updating path cache" +msg2 "${#pkgbuilds[@]} PKGBUILDs to update" +for _pkgbuild in ${pkgbuilds[@]}; do + $DEBUG && plain "$_pkgbuild" + source ${_pkgbuild} || { + error "${_pkgbuild} contains errors, skipping" + continue + } + + fullpath=$(dirname $(readlink -f ${_pkgbuild})) + + for _pkg in ${pkgname[@]}; do + paths+=(${_pkg}:${fullpath}) + done +done + +echo ${paths[@]} | tr ' ' "\n" | sort >> ${TORUPATH}/paths + +lastsync ${LASTSYNCFILE} -- cgit v1.2.3-2-g168b From 40fa0a4c04a34740b40c88a75b7ef1c816cda195 Mon Sep 17 00:00:00 2001 From: Nicolas Reynolds Date: Thu, 24 Nov 2011 11:09:23 -0300 Subject: Toru-path fixes --- toru-path | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'toru-path') diff --git a/toru-path b/toru-path index 82378a4..bdf2f23 100755 --- a/toru-path +++ b/toru-path @@ -7,8 +7,6 @@ LASTSYNCFILE=${TORUPATH}/lastsync.paths # TODO pass other paths via flags pkgbuilds=($(get_pkgbuilds ${ABSROOT})) paths=() -# TODO create a --ignore flag -ignore=($@) msg "Updating path cache" msg2 "${#pkgbuilds[@]} PKGBUILDs to update" @@ -21,8 +19,8 @@ for _pkgbuild in ${pkgbuilds[@]}; do fullpath=$(dirname $(readlink -f ${_pkgbuild})) - for _pkg in ${pkgname[@]}; do - paths+=(${_pkg}:${fullpath}) + for _pkg in ${pkgname[@]} ${provides[@]}; do + paths+=(${_pkg/[<>=]*}:${fullpath}) done done -- cgit v1.2.3-2-g168b From 55abb1e683ace68905f987bdcd452df6e709a9e8 Mon Sep 17 00:00:00 2001 From: Nicolas Reynolds Date: Wed, 14 Dec 2011 14:47:14 -0300 Subject: Perform cleanup to avoid bogus paths --- toru-path | 3 +++ 1 file changed, 3 insertions(+) (limited to 'toru-path') diff --git a/toru-path b/toru-path index bdf2f23..7500aed 100755 --- a/toru-path +++ b/toru-path @@ -22,8 +22,11 @@ for _pkgbuild in ${pkgbuilds[@]}; do for _pkg in ${pkgname[@]} ${provides[@]}; do paths+=(${_pkg/[<>=]*}:${fullpath}) done + + unset pkgname provides done +# TODO remove old paths echo ${paths[@]} | tr ' ' "\n" | sort >> ${TORUPATH}/paths lastsync ${LASTSYNCFILE} -- cgit v1.2.3-2-g168b