From 14d984e300a63391e3169b478cccedbfbc886bc6 Mon Sep 17 00:00:00 2001
From: "zed-zippy[bot]" <234243425+zed-zippy[bot]@users.noreply.github.com>
Date: Wed, 26 Nov 2025 08:09:32 +0000
Subject: [PATCH] shell: Correctly identifiy `powershell` shells on windows
 (#43526) (cherry-pick to preview) (#43529)

Cherry-pick of #43526 to preview

----
Release Notes:

- Fixed zed only finding pwsh but not powershell on windows

Co-authored-by: Lukas Wirth <lukas@zed.dev>
---
 crates/askpass/src/askpass.rs                |  1 +
 crates/gpui/src/platform/windows/platform.rs | 11 +++++----
 crates/util/src/shell.rs                     | 24 +++++++++++++-------
 3 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/crates/askpass/src/askpass.rs b/crates/askpass/src/askpass.rs
index 25db3144ccb10b9cac1b8d8555ea9924e193468c..a9047a567fd3b6323fb6edc64be4854f4da0a958 100644
--- a/crates/askpass/src/askpass.rs
+++ b/crates/askpass/src/askpass.rs
@@ -250,6 +250,7 @@ impl PasswordProxy {
             .await
             .with_context(|| format!("creating askpass script at {askpass_script_path:?}"))?;
         make_file_executable(&askpass_script_path).await?;
+        // todo(shell): There might be no powershell on the system
         #[cfg(target_os = "windows")]
         let askpass_helper = format!(
             "powershell.exe -ExecutionPolicy Bypass -File {}",
diff --git a/crates/gpui/src/platform/windows/platform.rs b/crates/gpui/src/platform/windows/platform.rs
index b7f13f1fab495b1040d1be8e7b86376c450b5f7e..006099c3828efb11b0981e81635fba0c452c8560 100644
--- a/crates/gpui/src/platform/windows/platform.rs
+++ b/crates/gpui/src/platform/windows/platform.rs
@@ -389,11 +389,12 @@ impl Platform for WindowsPlatform {
         #[allow(
             clippy::disallowed_methods,
             reason = "We are restarting ourselves, using std command thus is fine"
-        )]
-        let restart_process = util::command::new_std_command("powershell.exe")
-            .arg("-command")
-            .arg(script)
-            .spawn();
+        )] // todo(shell): There might be no powershell on the system
+        let restart_process =
+            util::command::new_std_command(util::shell::get_windows_system_shell())
+                .arg("-command")
+                .arg(script)
+                .spawn();
 
         match restart_process {
             Ok(_) => self.quit(),
diff --git a/crates/util/src/shell.rs b/crates/util/src/shell.rs
index ba54f7b7784b45613b28067afe2748339e6b6c64..6bfb83c1dd2fdc0ea73dce4a5feff3146285aa2e 100644
--- a/crates/util/src/shell.rs
+++ b/crates/util/src/shell.rs
@@ -191,14 +191,22 @@ pub fn get_windows_system_shell() -> String {
     }
 
     static SYSTEM_SHELL: LazyLock<String> = LazyLock::new(|| {
-        find_pwsh_in_programfiles(false, false)
-            .or_else(|| find_pwsh_in_programfiles(true, false))
-            .or_else(|| find_pwsh_in_msix(false))
-            .or_else(|| find_pwsh_in_programfiles(false, true))
-            .or_else(|| find_pwsh_in_msix(true))
-            .or_else(|| find_pwsh_in_programfiles(true, true))
-            .or_else(find_pwsh_in_scoop)
-            .map(|p| p.to_string_lossy().into_owned())
+        let locations = [
+            || find_pwsh_in_programfiles(false, false),
+            || find_pwsh_in_programfiles(true, false),
+            || find_pwsh_in_msix(false),
+            || find_pwsh_in_programfiles(false, true),
+            || find_pwsh_in_msix(true),
+            || find_pwsh_in_programfiles(true, true),
+            || find_pwsh_in_scoop(),
+            || which::which_global("pwsh.exe").ok(),
+            || which::which_global("powershell.exe").ok(),
+        ];
+
+        locations
+            .into_iter()
+            .find_map(|f| f())
+            .map(|p| p.to_string_lossy().trim().to_owned())
             .inspect(|shell| log::info!("Found powershell in: {}", shell))
             .unwrap_or_else(|| {
                 log::warn!("Powershell not found, falling back to `cmd`");