From b42f3c09383666dba57de9df5875ab361cdaefba Mon Sep 17 00:00:00 2001 From: Jim Myhrberg Date: Mon, 1 Jul 2013 12:20:11 +0200 Subject: [PATCH] Ensure correct root_dir for dotfile being parsed --- src/lib/internals.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/lib/internals.sh b/src/lib/internals.sh index 2e726fd..1053604 100644 --- a/src/lib/internals.sh +++ b/src/lib/internals.sh @@ -34,11 +34,11 @@ create-symlink() { } execute-dotfile() { - ROOTDIR="$(dirname "$DOTFILE")" parse-dotfile-options + local root_dir="$(dirname "$DOTFILE")" local cwd="$(pwd)" - cd "$rootdir" + cd "$root_dir" create-symlink "$root_dir" "$TARGET/$OPT_ROOT_LINK" if [ -n "$?" ]; then return 1; fi @@ -103,9 +103,10 @@ parse-dotfile-line() { include-dotfile() { local dotfile="$1" + local root_dir="$(dirname "$dotfile")" local cwd="$(pwd)" - cd "$rootdir" + cd "$root_dir" if [ ! -f "$dotfile" ]; then echo "ERROR: Can not include \"$dotfile\", it does not exist." >&2