From b1e0f89f4c85a0767a76ff3e0db4c888b6ac3002 Mon Sep 17 00:00:00 2001 From: William Boman Date: Thu, 25 Nov 2021 06:55:18 +0100 Subject: fix(windows): unset PSMODULEPATH before invoking powershell scripts (#278) --- lua/nvim-lsp-installer/process.lua | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'lua/nvim-lsp-installer/process.lua') diff --git a/lua/nvim-lsp-installer/process.lua b/lua/nvim-lsp-installer/process.lua index 7fe3625c..9316fd38 100644 --- a/lua/nvim-lsp-installer/process.lua +++ b/lua/nvim-lsp-installer/process.lua @@ -47,15 +47,19 @@ end ---Merges the provided env param with the user's full environent. Provided env has precedence. ---@param env table -function M.graft_env(env) +---@param excluded_var_names string[]|nil +function M.graft_env(env, excluded_var_names) + local excluded_var_names_set = excluded_var_names and Data.set_of(excluded_var_names) or {} local merged_env = {} for key, val in pairs(initial_environ) do - if env[key] == nil then + if not excluded_var_names_set[key] and env[key] == nil then merged_env[#merged_env + 1] = key .. "=" .. val end end for key, val in pairs(env) do - merged_env[#merged_env + 1] = key .. "=" .. val + if not excluded_var_names_set[key] then + merged_env[#merged_env + 1] = key .. "=" .. val + end end return merged_env end -- cgit v1.2.3-70-g09d2