From da785c8272457a70f21942bf4943bfc69f4fbeb8 Mon Sep 17 00:00:00 2001 From: Nicolas Reynolds Date: Mon, 27 Feb 2012 11:35:55 -0300 Subject: Use only one find --- toru-utils | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'toru-utils') diff --git a/toru-utils b/toru-utils index bb0aef4..2488091 100755 --- a/toru-utils +++ b/toru-utils @@ -59,17 +59,14 @@ get_pkgbuilds() { $QUIET || warning "Forcing upgrade" # Get all PKGBUILDs - pkgbuilds=($(find $@ -mindepth 2 -maxdepth 3 -type f -name 'PKGBUILD')) - + extra="" else - # Only find newer than lastsyncfile and read everything else from cache - pkgbuilds=($(find $@ -mindepth 2 -maxdepth 3 -type f -name 'PKGBUILD' -newer ${LASTSYNCFILE})) - + extra=" -newer ${LASTSYNCFILE}" fi # Return all PKGBUILDs found - echo ${pkgbuilds[@]} + find $@ -mindepth 2 -maxdepth 3 -type f -name 'PKGBUILD' ${extra} } # End inmediately but print a useful message -- cgit v1.2.3-54-g00ecf From 1873a2f71e77ffbd46258474851600bdb1ecc297 Mon Sep 17 00:00:00 2001 From: Nicolás Reynolds Date: Sun, 8 Apr 2012 16:55:08 -0300 Subject: Minor improvements --- toru-path | 2 +- toru-utils | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'toru-utils') diff --git a/toru-path b/toru-path index 71dc85c..5065a30 100755 --- a/toru-path +++ b/toru-path @@ -17,7 +17,7 @@ for _pkgbuild in ${pkgbuilds[@]}; do continue } - fullpath=$(dirname $(readlink -f ${_pkgbuild})) + fullpath=$(dirname ${_pkgbuild}) for _pkg in ${pkgbase} ${pkgname[@]} ${provides[@]}; do paths+=(${_pkg/[<>=]*}:${fullpath}) diff --git a/toru-utils b/toru-utils index 2488091..9a7918e 100755 --- a/toru-utils +++ b/toru-utils @@ -78,6 +78,6 @@ trap_exit() { # Trap signals from makepkg set -E -trap 'trap_exit "(prfullpkg:${level}) TERM signal caught. Exiting..."' TERM HUP QUIT -trap 'trap_exit "(prfullpkg:${level}) Aborted by user! Exiting..."' INT -trap 'trap_exit "(prfullpkg:${level}) An unknown error has occurred. Exiting..."' ERR +trap 'trap_exit "TERM signal caught. Exiting..."' TERM HUP QUIT +trap 'trap_exit "Aborted by user! Exiting..."' INT +trap 'trap_exit "An unknown error has occurred. Exiting..."' ERR -- cgit v1.2.3-54-g00ecf