From bc2836bbda090c224eebfe794d0f3607d82bb1e0 Mon Sep 17 00:00:00 2001 From: Yorick Barbanneau Date: Tue, 5 Oct 2021 22:20:52 +0200 Subject: [PATCH] Some corrections on link_* functions --- src/dotinstall | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/dotinstall b/src/dotinstall index a6b2a41..8669469 100755 --- a/src/dotinstall +++ b/src/dotinstall @@ -217,11 +217,15 @@ link_directory () { # $2: destination directory local source - source="${repository}/$1" + source="$1" local dest dest="$2" printf "\nProcess directory %s\n" "$source" - + if [[ ! $source =~ ^$repository ]] + then + echo "Add repo before source" + source="${repository}/$source" + fi [ ! -d "$source" ] && { error " -> source is not a directory"; return; } [ ! -d "$dest" ] && { error " -> destination is not a directory"; return; } @@ -248,13 +252,10 @@ link_directories () { dest="$2" printf "\nProcess directory %s\n" "$source" - [ ! -d "$source" ] && { error " -> source is not a directory"; return; } - [ ! -d "$dest" ] && { error " -> destination is not a directory"; return; } - while read -r d do link_directory "$d" "${dest}" - done < <(ls -d -1 "${source}"/*/) + done < <(ls -d -1 "${repository}/${source}"/*/) } link_files () {