From cfd7f4196104437a1a0dceb22d400a7bb8cee189 Mon Sep 17 00:00:00 2001 From: merakor Date: Wed, 15 Apr 2020 09:56:04 +0000 Subject: kiss: respect KISS_ROOT values in fixdeps FossilOrigin-Name: d1d2b91ad2374ef94a874469a35718ca2e8de3dcaf389c4cff7c60bb25dfd430 --- kiss | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/kiss b/kiss index 7ddca39..86e7198 100755 --- a/kiss +++ b/kiss @@ -436,13 +436,13 @@ pkg_fixdeps() { dep=$(readlink -f "$dep") # Figure out which package owns the file. - own=$("$grep" -lFx "${dep##$KISS_ROOT}" "$@") + own=$("$grep" -lFx "${dep#$KISS_ROOT}" "$@") # If the package wasn't found, retry by removing # the '/usr' prefix. - if [ -z "$own" ] && [ -z "${dep%%/usr*}" ]; then + if [ -z "$own" ] && [ -z "${dep##$KISS_ROOT/usr*}" ]; then + own=$("$grep" -lFx "${dep#$KISS_ROOT/usr}" "$@") dep=${dep#/usr} - own=$("$grep" -lFx "${dep##$KISS_ROOT}" "$@") fi # Extract package name from 'grep' match. -- cgit v1.2.3