From 0d5499f7b820a99f5eb73f5e5e40ec344aee78df Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Wed, 25 Mar 2020 17:36:13 +0200 Subject: [PATCH] kiss: fixdeps clean up --- kiss | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/kiss b/kiss index 85664a8..cff39f1 100755 --- a/kiss +++ b/kiss @@ -409,19 +409,17 @@ pkg_fixdeps() { dep=${dep% *} # Figure out which package owns the file. - dep=$("$grep" -lFx "${dep##$KISS_ROOT}" "$@") + own=$("$grep" -lFx "${dep##$KISS_ROOT}" "$@") + own=${own%/*} + own=${own##*/} - # Extract package name from 'grep' match. - dep=${dep%/*} - dep=${dep##*/} + # Skip listing these packages as dependencies. + case $own in musl|gcc|${PWD##*/}|"") continue; esac - case $dep in - # Skip listing these packages as dependencies. - musl|gcc|${PWD##*/}|"") ;; - *) printf '%s\n' "$dep" - printf 'Found %s\n' \ - "$dep (${file##$pkg_dir/${PWD##*/}})" >/dev/tty - esac + printf 'Found %s (%s) in (%s)\n' "$own" "$dep" \ + "${file##$pkg_dir/${PWD##*/}}" >/dev/tty + + printf '%s\n' "$own" done ||: done } |