From 3b64a9939d42568a887cd08a58db7d9dde9d1c42 Mon Sep 17 00:00:00 2001
From: Kevin Gosse <krix33@gmail.com>
Date: Tue, 17 Mar 2026 10:03:24 +0100
Subject: [PATCH] Search shell in path

---
 src/term_emu/terminal_emulator.rs | 35 +++++++++++++++++++++++++++++--
 1 file changed, 33 insertions(+), 2 deletions(-)

diff --git a/src/term_emu/terminal_emulator.rs b/src/term_emu/terminal_emulator.rs
index 71cd157..b0925bc 100644
--- a/src/term_emu/terminal_emulator.rs
+++ b/src/term_emu/terminal_emulator.rs
@@ -20,6 +20,37 @@ pub struct ShellConfig {
     pub shell_path: Option<String>,
 }
 
+/// Check if a shell can be found, either as a direct path or via PATH lookup
+fn shell_exists(name: &str) -> bool {
+    let path = std::path::Path::new(name);
+    if path.exists() {
+        return true;
+    }
+    // Only search PATH for bare names (no directory separators)
+    if name.contains('/') || name.contains('\\') {
+        return false;
+    }
+    if let Ok(path_var) = std::env::var("PATH") {
+        for dir in std::env::split_paths(&path_var) {
+            if dir.join(name).exists() {
+                return true;
+            }
+            #[cfg(windows)]
+            {
+                if !name.contains('.') {
+                    if dir.join(format!("{}.exe", name)).exists() {
+                        return true;
+                    }
+                    if dir.join(format!("{}.cmd", name)).exists() {
+                        return true;
+                    }
+                }
+            }
+        }
+    }
+    false
+}
+
 impl ShellConfig {
     /// Create a shell config with a custom shell path
     pub fn custom_shell(path: String) -> Self {
@@ -32,7 +63,7 @@ impl ShellConfig {
     /// Returns Ok(()) if valid, Err with message if invalid
     pub fn validate(&self) -> Result<(), String> {
         if let Some(ref path) = self.shell_path {
-            if !std::path::Path::new(path).exists() {
+            if !shell_exists(path) {
                 return Err(format!("Shell '{}' not found", path));
             }
             // Check if file is executable on Unix
@@ -105,7 +136,7 @@ impl TerminalEmulator {
             cmd
         } else if let Some(ref shell_path) = shell_config.shell_path {
             // Use custom shell if specified and valid
-            if std::path::Path::new(shell_path).exists() {
+            if shell_exists(shell_path) {
                 CommandBuilder::new(shell_path)
             } else {
                 // Shell doesn't exist, fall back to default (validation should catch this earlier)