diff options
| author | William Boman <william@redwill.se> | 2022-12-19 11:06:58 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-19 11:06:58 +0100 |
| commit | e1556b8e2ae846f8edd47b88c34f600b13ac0284 (patch) | |
| tree | 6ee1a39790bcb0b899b150442bba3f5323c18a94 /lua | |
| parent | chore: update generated code (#768) (diff) | |
| download | mason-e1556b8e2ae846f8edd47b88c34f600b13ac0284.tar mason-e1556b8e2ae846f8edd47b88c34f600b13ac0284.tar.gz mason-e1556b8e2ae846f8edd47b88c34f600b13ac0284.tar.bz2 mason-e1556b8e2ae846f8edd47b88c34f600b13ac0284.tar.lz mason-e1556b8e2ae846f8edd47b88c34f600b13ac0284.tar.xz mason-e1556b8e2ae846f8edd47b88c34f600b13ac0284.tar.zst mason-e1556b8e2ae846f8edd47b88c34f600b13ac0284.zip | |
Revert "chore: use pwsh instead of powershell (#706)" (#769)
This reverts commit e64dffb84e84e67836a05707a95b1d81fe698481.
Diffstat (limited to 'lua')
| -rw-r--r-- | lua/mason-core/managers/powershell/init.lua | 4 | ||||
| -rw-r--r-- | lua/mason/health/init.lua | 12 |
2 files changed, 4 insertions, 12 deletions
diff --git a/lua/mason-core/managers/powershell/init.lua b/lua/mason-core/managers/powershell/init.lua index d2656194..5cc5e21d 100644 --- a/lua/mason-core/managers/powershell/init.lua +++ b/lua/mason-core/managers/powershell/init.lua @@ -15,7 +15,7 @@ function M.script(script, opts, custom_spawn) opts = opts or {} ---@type JobSpawn local spawner = custom_spawn or spawn - return spawner.pwsh(vim.tbl_extend("keep", { + return spawner.powershell(vim.tbl_extend("keep", { "-NoProfile", on_spawn = function(_, stdio) local stdin = stdio[1] @@ -35,7 +35,7 @@ function M.command(command, opts, custom_spawn) opts = opts or {} ---@type JobSpawn local spawner = custom_spawn or spawn - return spawner.pwsh(vim.tbl_extend("keep", { + return spawner.powershell(vim.tbl_extend("keep", { "-NoProfile", "-Command", PWSHOPT.progress_preference .. PWSHOPT.security_protocol .. command, diff --git a/lua/mason/health/init.lua b/lua/mason/health/init.lua index 0e33911d..5003bb0a 100644 --- a/lua/mason/health/init.lua +++ b/lua/mason/health/init.lua @@ -221,16 +221,8 @@ function M.check() relaxed = platform.is.win, }, check { cmd = "tar", args = { "--version" }, name = "tar" }, - check { - cmd = "pwsh", - args = { - "-NoProfile", - "-Command", - [[$PSVersionTable.PSVersion, $PSVersionTable.OS, $PSVersionTable.Platform -join " "]], - }, - name = "pwsh", - relaxed = not platform.is.win, - }, + -- when(platform.is.win, check { cmd = "powershell.exe", args = { "-Version" }, name = "PowerShell" }), -- TODO fix me + -- when(platform.is.win, check { cmd = "cmd.exe", args = { "-Version" }, name = "cmd" }) -- TODO fix me } if platform.is.unix then |