From 15c89f642335d3f5ea5fb8ecbccd44246e15cd82 Mon Sep 17 00:00:00 2001 From: Wolf Gupta <67585967+git-bruh@users.noreply.github.com> Date: Sat, 17 Sep 2022 22:24:47 +0530 Subject: [PATCH] kiss: fix masking local source as remote, closes #70 (#73) --- kiss | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/kiss b/kiss index 570657f..ad2ab2f 100755 --- a/kiss +++ b/kiss @@ -360,14 +360,18 @@ pkg_source_resolve() { _des=$src_dir/$1/${3:+"$3/"}${2##*/} _des=${_des%[@#]*}/ - # Remote source (cached). - elif [ -f "$src_dir/$1/${3:+"$3/"}${2##*/}" ]; then - _res=$src_dir/$1/${3:+"$3/"}${2##*/} - # Remote source. elif null "${2##*://*}"; then - _res=url+$2 - _des=$src_dir/$1/${3:+"$3/"}${2##*/} + # Remote source (cached). + # Only check if we detect a remote source to avoid + # masking local paths like 'files/test' as cached + # if '$src_dir/$1/test' is present + if [ -f "$src_dir/$1/${3:+"$3/"}${2##*/}" ]; then + _res=$src_dir/$1/${3:+"$3/"}${2##*/} + else + _res=url+$2 + _des=$src_dir/$1/${3:+"$3/"}${2##*/} + fi # Local relative dir. elif [ -d "$repo_dir/$2" ]; then