diff options
author | Egor Tensin <Egor.Tensin@gmail.com> | 2020-01-24 02:09:00 +0300 |
---|---|---|
committer | Egor Tensin <Egor.Tensin@gmail.com> | 2020-01-24 10:17:11 +0300 |
commit | e4107472211697b152c0a2b0746974e1c00d7d1f (patch) | |
tree | 6789c41b22fcd6b6ec9d7d1dc437ae5cccb6adb6 | |
parent | Travis: test_symlinks_unlink_works (diff) | |
download | config-links-e4107472211697b152c0a2b0746974e1c00d7d1f.tar.gz config-links-e4107472211697b152c0a2b0746974e1c00d7d1f.zip |
fix Travis test test_symlinks_unlink_works
-rwxr-xr-x | .travis/test.sh | 8 | ||||
-rw-r--r-- | src/db.sh | 2 |
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" } @@ -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" |