From 508e7c547dacb8b930885fd61057cb8d2868aaf8 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sat, 6 Jun 2015 17:07:10 -0600 Subject: tidy up toru-{info,path} - Quote variables - toru-path: make LASTSYNCFILE and PATHFILE lowercase - toru-path: set IFS when it matters - use `if` instead of && and whatnot - use printf-formatters instead of string interpolation --- src/toru/toru-info | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'src/toru/toru-info') diff --git a/src/toru/toru-info b/src/toru/toru-info index 0c961b9..a7081cb 100755 --- a/src/toru/toru-info +++ b/src/toru/toru-info @@ -21,23 +21,23 @@ . libremessages . "$(librelib conf)" -for _pkg in $@; do +for _pkg in "$@"; do _pkgbuild="$(toru-where $_pkg)" if [ -f "$_pkgbuild/PKGBUILD" ]; then - load_PKGBUILD "$_pkgbuild/PKGBUILD" 2>/dev/null || { - warning "Errors on %s" $_pkg + if ! load_PKGBUILD "$_pkgbuild/PKGBUILD" 2>/dev/null; then + warning "Errors on %s" "$_pkg" continue - } + fi - deps="${depends[@]} ${makedepends[@]} ${checkdepends[@]}" - repo="$(basename $(dirname "$_pkgbuild"))" + deps=("${depends[@]}" "${makedepends[@]}" "${checkdepends[@]}") + repo="$(basename -- "$(dirname -- "$_pkgbuild")")" - msg "%s/%s %s-%s" $repo $_pkg $pkgver $pkgrel - msg2 "$pkgdesc" - msg2 "$url" - msg2 "Depends: ${deps}" + msg "%s/%s %s-%s" "$repo" "$_pkg" "$pkgver" "$pkgrel" + msg2 '%s' "$pkgdesc" + msg2 '%s' "$url" + msg2 'Depends: %s' "${deps[*]}" else - warning "%s doesn't exist" $_pkg + warning "%s doesn't exist" "$_pkg" fi done -- cgit v1.2.3-2-g168b