diff options
| author | Luke Shumaker <lukeshu@lukeshu.com> | 2017-05-01 17:22:26 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@lukeshu.com> | 2017-05-04 14:25:46 -0400 |
| commit | b245def72cd67e6475651b12e3313d8011b128bc (patch) | |
| tree | fca8943067ea57909f9e95a91d4141606684ce3b | |
| parent | 11688ffd4f9fa20aa8f01e1e50d9a979c6c92768 (diff) | |
bugfix [2/2]: toru-path
| -rw-r--r-- | src/lib/conf.sh.in | 1 | ||||
| -rwxr-xr-x | src/toru/toru-path | 9 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/conf.sh.in b/src/lib/conf.sh.in index 63d5cf9..30469ca 100644 --- a/src/lib/conf.sh.in +++ b/src/lib/conf.sh.in @@ -239,4 +239,5 @@ load_PKGBUILD() { unset_PKGBUILD CARCH="$(get_var makepkg CARCH "`uname -m`")" . "$file" + pkgbase=${pkgbase:-${pkgname[0]}} } diff --git a/src/toru/toru-path b/src/toru/toru-path index 2c00bc7..56bea42 100755 --- a/src/toru/toru-path +++ b/src/toru/toru-path @@ -3,7 +3,7 @@ # Copyright (C) 2011-2012 Nicolás Reynolds <fauno@parabola.nu> # Copyright (C) 2012 Michał Masłowski <mtjm@mtjm.eu> # Copyright (C) 2012 Joshua Ismael Haase Hernández (xihh) <hahj87@gmail.com> -# Copyright (C) 2014 Luke Shumaker <lukeshu@sbcglobal.net> +# Copyright (C) 2014-2015, 2017 Luke Shumaker <lukeshu@sbcglobal.net> # # License: GNU GPLv3+ # @@ -55,9 +55,8 @@ fullrepos=() for (( i = ${#REPOS[@]}-1 ; i >= 0 ; i-- )); do $VERBOSE && msg "Processing [%s]" "${REPOS[$i]}" - # ABSROOT has trailing slash - if [ -d "${ABSROOT}${REPOS[$i]}" ]; then - fullrepos+=("${ABSROOT}${REPOS[$i]}") + if [ -d "${ABSROOT}/${REPOS[$i]}" ]; then + fullrepos+=("${ABSROOT}/${REPOS[$i]}") fi done @@ -74,7 +73,7 @@ pkgbuilds=($(find "${find_args[@]}")) # Add information from each of the PKGBUILDs to the toru cache. msg "Updating path cache" msg2 "%d PKGBUILDs to update" ${#pkgbuilds[@]} -for pkgbuild in "${pkgbuilds[@]}"; do +for _pkgbuild in "${pkgbuilds[@]}"; do # plain "$_pkgbuild" if ! load_PKGBUILD "${_pkgbuild}" >/dev/null 2>&1; then error "%q contains errors, skipping" "${_pkgbuild}" |