diff options
author | merakor <cem@ckyln.com> | 2020-04-15 09:56:04 +0000 |
---|---|---|
committer | merakor <cem@ckyln.com> | 2020-04-15 09:56:04 +0000 |
commit | cfd7f4196104437a1a0dceb22d400a7bb8cee189 (patch) | |
tree | c924fcf7431b201919785ae86cd1e7d34710763f | |
parent | 165e385f85c78cca76487fd3f99ac06678140aeb (diff) | |
download | cpt-cfd7f4196104437a1a0dceb22d400a7bb8cee189.tar.gz |
kiss: respect KISS_ROOT values in fixdeps1.12.2
FossilOrigin-Name: d1d2b91ad2374ef94a874469a35718ca2e8de3dcaf389c4cff7c60bb25dfd430
-rwxr-xr-x | kiss | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -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. |