feat(linker): use relative targets for symlinks (#1525)

Closes #1156.

2 files changed, 20 insertions, 35 deletions

diff --git a/tests/mason-core/installer/linker_spec.lua b/tests/mason-core/installer/linker_spec.lua
index eb5ce394..9d3afeac 100644
--- a/tests/mason-core/installer/linker_spec.lua
+++ b/tests/mason-core/installer/linker_spec.lua
@@ -14,7 +14,7 @@ EXIT /b
 SETLOCAL
 CALL :find_dp0
 
-endLocal & goto #_undefined_# 2>NUL || title %%COMSPEC%% & "%s" %%*]]
+endLocal & goto #_undefined_# 2>NUL || title %%COMSPEC%% & "%%dp0%%\%s" %%*]]
 
 describe("linker", function()
     local snapshot
@@ -63,13 +63,10 @@ describe("linker", function()
         assert.spy(fs.async.symlink).was_called(2)
         assert
             .spy(fs.async.symlink)
-            .was_called_with(path.concat { dummy:get_install_path(), "another-executable" }, ctx.location:bin "another-executable")
+            .was_called_with("../packages/dummy/another-executable", ctx.location:bin "another-executable")
         assert
             .spy(fs.async.symlink)
-            .was_called_with(
-                path.concat { dummy:get_install_path(), "nested", "path", "my-executable" },
-                ctx.location:bin "my-executable"
-            )
+            .was_called_with("../packages/dummy/nested/path/my-executable", ctx.location:bin "my-executable")
     end)
 
     it("should write executable wrapper on Windows", function()
@@ -101,14 +98,15 @@ describe("linker", function()
 
         assert.spy(fs.async.symlink).was_called(0)
         assert.spy(fs.async.write_file).was_called(2)
-        assert.spy(fs.async.write_file).was_called_with(
-            ctx.location:bin "another-executable.cmd",
-            WIN_CMD_SCRIPT:format(path.concat { dummy:get_install_path(), "another-executable" })
-        )
-        assert.spy(fs.async.write_file).was_called_with(
-            ctx.location:bin "my-executable.cmd",
-            WIN_CMD_SCRIPT:format(path.concat { dummy:get_install_path(), "nested", "path", "my-executable" })
-        )
+        assert
+            .spy(fs.async.write_file)
+            .was_called_with(ctx.location:bin "another-executable.cmd", WIN_CMD_SCRIPT:format "..\\packages\\dummy\\another-executable")
+        assert
+            .spy(fs.async.write_file)
+            .was_called_with(
+                ctx.location:bin "my-executable.cmd",
+                WIN_CMD_SCRIPT:format "..\\packages\\dummy\\nested\\path\\my-executable"
+            )
     end)
 
     it("should symlink share files", function()
@@ -142,13 +140,10 @@ describe("linker", function()
 
         assert.spy(fs.async.write_file).was_called(0)
         assert.spy(fs.async.symlink).was_called(2)
+        assert.spy(fs.async.symlink).was_called_with("../packages/dummy/share-file", ctx.location:share "share-file")
         assert
             .spy(fs.async.symlink)
-            .was_called_with(path.concat { dummy:get_install_path(), "share-file" }, ctx.location:share "share-file")
-        assert.spy(fs.async.symlink).was_called_with(
-            path.concat { dummy:get_install_path(), "nested", "path", "to", "share-file" },
-            ctx.location:share "nested/path/share-file"
-        )
+            .was_called_with("../../../packages/dummy/nested/path/to/share-file", ctx.location:share "nested/path/share-file")
 
         assert.spy(fs.async.mkdirp).was_called(2)
         assert.spy(fs.async.mkdirp).was_called_with(ctx.location:share "nested/path")
diff --git a/tests/mason-core/path_spec.lua b/tests/mason-core/path_spec.lua
index 4aeb48f1..905df6ab 100644
--- a/tests/mason-core/path_spec.lua
+++ b/tests/mason-core/path_spec.lua
@@ -2,18 +2,8 @@ local path = require "mason-core.path"
 
 describe("path", function()
     it("concatenates paths", function()
-        assert.equals("foo/bar/baz/~", path.concat { "foo", "bar", "baz", "~" })
-    end)
-
-    it("concatenates paths on Windows", function()
-        local old_os = jit.os
-        -- selene: allow(incorrect_standard_library_use)
-        jit.os = "windows"
-        package.loaded["mason-core.path"] = nil
-        local path = require "mason-core.path"
-        assert.equals([[foo\bar\baz\~]], path.concat { "foo", "bar", "baz", "~" })
-        -- selene: allow(incorrect_standard_library_use)
-        jit.os = old_os
+        assert.equals("foo/bar/baz", path.concat { "foo", "bar", "baz" })
+        assert.equals("foo/bar/baz", path.concat { "foo/", "bar/", "baz/" })
     end)
 
     it("identifies subdirectories", function()
@@ -28,7 +18,7 @@ describe("path", function()
             {
                 from = "/home/user/dir1/fileA",
                 to = "/home/user/dir1/fileB",
-                expected = "./fileB",
+                expected = "fileB",
             },
             {
                 from = "/home/user/dir1/fileA",
@@ -43,7 +33,7 @@ describe("path", function()
             {
                 from = "/home/user/dir1/subdir/fileD",
                 to = "/home/user/dir1/subdir/fileF",
-                expected = "./fileF",
+                expected = "fileF",
             },
             {
                 from = "/home/user/dir1/fileG",
@@ -58,12 +48,12 @@ describe("path", function()
             {
                 from = "/fileK",
                 to = "/home/fileL",
-                expected = "./home/fileL",
+                expected = "home/fileL",
             },
             {
                 from = "/home/user/fileM",
                 to = "/home/user/dir1/dir2/fileL",
-                expected = "./dir1/dir2/fileL",
+                expected = "dir1/dir2/fileL",
             },
         }