From dce4d5c1c707373d4bcd30b011cb88c6c15babe7 Mon Sep 17 00:00:00 2001 From: Yorick Barbanneau Date: Sun, 24 Nov 2019 23:55:20 +0100 Subject: [PATCH 1/3] Path error in process_files() --- src/dotinstall | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/dotinstall b/src/dotinstall index 85aaaad..3a27980 100755 --- a/src/dotinstall +++ b/src/dotinstall @@ -207,23 +207,24 @@ process_files () { # $1: source directory # $2: destination directory - local dest="${repository}/$1" - printf "Process files from directory %s:\n" "$1" + local source="${repository}/$1" + local dest="$2" + printf "Process files from directory %s:\n" "$source" - [ ! -d "$dest" ] && { error " -> source is not a directory"; return; } + [ ! -d "$source" ] && { error " -> source is not a directory"; return; } [ ! -d "$dest" ] && { error " -> destination is not a directory"; return; } while read d do if [ $install -eq 1 ] then - private:create_symblink "$d" "$2/$(basename "$d")" + private:create_symblink "${source}/$d" "${dest}/$(basename "$d")" else local symblink="${2}/$(basename ${d})" private:remove_symblink "$symblink" fi - done < <(ls -1 "$dest") + done < <(ls -A -1 "$source") } From afff4a3560e1d20f68694ae7b37c2648aff820bf Mon Sep 17 00:00:00 2001 From: Yorick Barbanneau Date: Sun, 24 Nov 2019 23:58:43 +0100 Subject: [PATCH 2/3] Clarify variables names in process_dirs() --- src/dotinstall | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/dotinstall b/src/dotinstall index 3a27980..138e91c 100755 --- a/src/dotinstall +++ b/src/dotinstall @@ -180,8 +180,8 @@ process_dirs () { # $1: source directory # $2: destination directory - local dest="${repository}/$1" - local source="$2" + local source="${repository}/$1" + local dest="$2" printf "\nProcess directory %s\n" "$source" [ ! -d "$source" ] && { error " -> source is not a directory"; return; } @@ -191,13 +191,13 @@ process_dirs () { do if [ $install -eq 1 ] then - private:create_symblink "$d" "${2}/$(basename "$d")" + private:create_symblink "$d" "${dest}/$(basename "$d")" else - local symblink="${2}/$(basename ${d})" + local symblink="${dest}/$(basename ${d})" private:remove_symblink "$symblink" fi - done < <(ls -d -1 "${dest}"/*/) + done < <(ls -d -1 "${source}"/*/) } process_files () { From b8d999d918ec98a63d1458a295849a91197b0d23 Mon Sep 17 00:00:00 2001 From: Yorick Barbanneau Date: Sun, 24 Nov 2019 23:59:38 +0100 Subject: [PATCH 3/3] Replace check_bin() by reauired_commands in main --- src/dotinstall | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/dotinstall b/src/dotinstall index 138e91c..679ddc6 100755 --- a/src/dotinstall +++ b/src/dotinstall @@ -351,7 +351,7 @@ esac if [[ $* =~ ^https://.*\.git$ || $* =~ ^ssh://.*\.git$ ]] then - check_bin "git" + required_commands "git" # Check localrepo="${DOTREPO}/$(basename $* .git)"