aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorEgor Tensin <Egor.Tensin@gmail.com>2020-01-24 02:09:00 +0300
committerEgor Tensin <Egor.Tensin@gmail.com>2020-01-24 10:17:11 +0300
commite4107472211697b152c0a2b0746974e1c00d7d1f (patch)
tree6789c41b22fcd6b6ec9d7d1dc437ae5cccb6adb6
parentTravis: test_symlinks_unlink_works (diff)
downloadconfig-links-e4107472211697b152c0a2b0746974e1c00d7d1f.tar.gz
config-links-e4107472211697b152c0a2b0746974e1c00d7d1f.zip
fix Travis test test_symlinks_unlink_works
Diffstat (limited to '')
-rwxr-xr-x.travis/test.sh8
-rw-r--r--src/db.sh2
2 files changed, 6 insertions, 4 deletions
diff --git a/.travis/test.sh b/.travis/test.sh
index 46f5499..5d8eabe 100755
--- a/.travis/test.sh
+++ b/.travis/test.sh
@@ -149,13 +149,13 @@ $test_dest_dir/bar/baz/4.txt->$test_src_dir/%DEST%/bar/baz/4.txt"
verify_output "$expected_output"
expected_output="$test_alt_dest_dir->
-$test_alt_dest_dir/1.txt->$test_src_dir/%ALT_DEST%/1.txt
+$test_alt_dest_dir/1.txt->$test_src_dir/%DEST%/1.txt
$test_alt_dest_dir/foo->
-$test_alt_dest_dir/foo/2.txt->$test_src_dir/%ALT_DEST%/foo/2.txt
+$test_alt_dest_dir/foo/2.txt->$test_src_dir/%DEST%/foo/2.txt
$test_alt_dest_dir/bar->
-$test_alt_dest_dir/bar/3.txt->$test_src_dir/%ALT_DEST%/bar/3.txt
+$test_alt_dest_dir/bar/3.txt->$test_src_dir/%DEST%/bar/3.txt
$test_alt_dest_dir/bar/baz->
-$test_alt_dest_dir/bar/baz/4.txt->$test_src_dir/%ALT_DEST%/bar/baz/4.txt"
+$test_alt_dest_dir/bar/baz/4.txt->$test_src_dir/%DEST%/bar/baz/4.txt"
verify_output "$expected_output" "$test_alt_dest_dir"
}
diff --git a/src/db.sh b/src/db.sh
index 990d0a1..e96c48c 100644
--- a/src/db.sh
+++ b/src/db.sh
@@ -62,6 +62,8 @@ add_entry() {
local shared_path="$shared_var_dir"
[ "$shared_var_dir" != / ] && shared_path="$shared_path/"
shared_path="$shared_path$subpath"
+ shared_path="$( traverse_path -- "$shared_path" )"
+
local symlink_path="$symlink_var_dir"
[ "$symlink_var_dir" != / ] && symlink_path="$symlink_path/"
symlink_path="$symlink_path$subpath"