From 1a6cfc51c56a5f3447067573d764fe498af409ae Mon Sep 17 00:00:00 2001 From: emmett1 Date: Fri, 28 Jun 2024 22:56:18 +0800 Subject: fix pkg_path used --- apkg | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'apkg') diff --git a/apkg b/apkg index 00e1f51..c876fc5 100755 --- a/apkg +++ b/apkg @@ -385,6 +385,7 @@ pkg_path() { for r in $APKG_REPO; do [ -f $r/$p/abuild ] && { echo $r/$p + break } done done @@ -396,7 +397,7 @@ die() { } checkdep() { - pkg_path $1 >/dev/null || return + [ "$(pkg_path $1)" ] || return # track processed pkg to avoid cycle deps process="$process $1" for ii in $(pkg_depends $1); do @@ -442,7 +443,7 @@ pkg_dependents() { } pkg_depends() { - _path=$(pkg_path $1) >/dev/null || return 1 + _path=$(pkg_path $1) || return 1 [ -s $_path/depends ] || return grep -Ev ^'(#|$)' $_path/depends | awk '{print $1}' } @@ -503,7 +504,7 @@ pkg_depinstalll() { msg "Package '$p' is installed" continue fi - if ! pkg_path $p >/dev/null; then + if [ ! "$(pkg_path $p)" ]; then msg "Package '$p' not found" continue fi @@ -638,7 +639,7 @@ main() { if [ "$pkg" ]; then for p in $pkg; do - pkg_path $p >/dev/null || { + [ "$(pkg_path $p)" ] || { msg "Package '$p' not found" continue } -- cgit v1.2.3