fix(powershell) convert "Stop" to 'Stop' and a join parameter to sing…

…le quotes
williamboman · Nov 13, 2024 · 8d1a462 · 8d1a462
1 parent e2f7f90
commit 8d1a462
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/lua/mason-core/managers/powershell/init.lua b/lua/mason-core/managers/powershell/init.lua
@@ -8,7 +8,7 @@ local M = {}
 local PWSHOPT = {
     progress_preference = [[ $ProgressPreference = 'SilentlyContinue'; ]], -- https://stackoverflow.com/a/63301751
     security_protocol = [[ [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; ]],
-    error_action_preference = [[ $ErrorActionPreference = "Stop"; ]],
+    error_action_preference = [[ $ErrorActionPreference = 'Stop'; ]],
 }
 
 local powershell = _.lazy(function()

diff --git a/lua/mason/health.lua b/lua/mason/health.lua
@@ -155,13 +155,13 @@ local function check_core_utils()
 
     if platform.is.win then
         check {
-            cmd = "pwsh",
+            cmd = (vim.fn.executable "pwsh" == 1 and "pwsh" or "powershell"),
             args = {
                 "-NoProfile",
                 "-Command",
-                [[$PSVersionTable.PSVersion, $PSVersionTable.OS, $PSVersionTable.Platform -join " "]],
+                [[$PSVersionTable.PSVersion, $PSVersionTable.OS, $PSVersionTable.Platform -join ' ']],
             },
-            name = "pwsh",
+            name = (vim.fn.executable "pwsh" == 1 and "pwsh" or "powershell")  -- mason switched back to a powershell default
         }
         check { cmd = "7z", args = { "--help" }, name = "7z", relaxed = true }
     end