aboutsummaryrefslogtreecommitdiffstats
path: root/lua
diff options
context:
space:
mode:
authorWilliam Boman <william@redwill.se>2023-04-23 22:43:56 +0200
committerGitHub <noreply@github.com>2023-04-23 22:43:56 +0200
commit9a68a4bd997b72cee4132459e0fd99eea0cdc627 (patch)
tree9653770242717851377e4cda62be36902c1e416c /lua
parentfix(linker): don't symlink on Windows (#1253) (diff)
downloadmason-9a68a4bd997b72cee4132459e0fd99eea0cdc627.tar
mason-9a68a4bd997b72cee4132459e0fd99eea0cdc627.tar.gz
mason-9a68a4bd997b72cee4132459e0fd99eea0cdc627.tar.bz2
mason-9a68a4bd997b72cee4132459e0fd99eea0cdc627.tar.lz
mason-9a68a4bd997b72cee4132459e0fd99eea0cdc627.tar.xz
mason-9a68a4bd997b72cee4132459e0fd99eea0cdc627.tar.zst
mason-9a68a4bd997b72cee4132459e0fd99eea0cdc627.zip
refactor(linker): copy_file instead of rename on Windows (#1254)
Renaming the file will move it from its original installation directory. While reaching into package installation directories is unsupported and not recommended, it seems to be done pretty broadly. In order to avoid unnecessarily breaking people's configs we copy the file instead, for now. (tip: use the stable locations inside $MASON/share $MASON/opt $MASON/bin, if a package is missing a link please open an issue/PR). This will be reversed back to use uv_fs_rename() in 1.x.x.
Diffstat (limited to 'lua')
-rw-r--r--lua/mason-core/fs.lua8
-rw-r--r--lua/mason-core/installer/linker.lua8
2 files changed, 12 insertions, 4 deletions
diff --git a/lua/mason-core/fs.lua b/lua/mason-core/fs.lua
index 3c60cf61..203c96d7 100644
--- a/lua/mason-core/fs.lua
+++ b/lua/mason-core/fs.lua
@@ -86,6 +86,14 @@ local function make_module(uv)
end
---@param path string
+ ---@param new_path string
+ ---@param flags table? { excl?: boolean, ficlone?: boolean, ficlone_force?: boolean }
+ function M.copy_file(path, new_path, flags)
+ log.debug("fs: copy_file", path, new_path, flags)
+ uv.fs_copyfile(path, new_path, flags)
+ end
+
+ ---@param path string
---@param contents string
---@param flags string? Defaults to "w".
function M.write_file(path, contents, flags)
diff --git a/lua/mason-core/installer/linker.lua b/lua/mason-core/installer/linker.lua
index c9a87027..7a1098fb 100644
--- a/lua/mason-core/installer/linker.lua
+++ b/lua/mason-core/installer/linker.lua
@@ -102,9 +102,9 @@ end
---@param context InstallContext
---@param link_context LinkContext
-local function rename(context, link_context)
+local function copyfile(context, link_context)
return link(context, link_context, function(new_abs_path, target_abs_path)
- return Result.pcall(fs.async.rename, target_abs_path, new_abs_path)
+ return Result.pcall(fs.async.copy_file, target_abs_path, new_abs_path, { excl = true })
end)
end
@@ -138,8 +138,8 @@ function M.link(context)
return Result.try(function(try)
if platform.is.win then
try(win_bin_wrapper(context))
- try(rename(context, LinkContext.SHARE))
- try(rename(context, LinkContext.OPT))
+ try(copyfile(context, LinkContext.SHARE))
+ try(copyfile(context, LinkContext.OPT))
else
try(symlink(context, LinkContext.BIN))
try(symlink(context, LinkContext.SHARE))