From 110b23aefb3c4b91c9d8cca594041b93f0e078dd Mon Sep 17 00:00:00 2001
From: Grzegorz Zdunek <gzdunek@users.noreply.github.com>
Date: Tue, 17 Sep 2024 09:23:43 +0200
Subject: [PATCH] Restore the previous order of shell arguments in
 `resolveShellEnv` (#46631)

---
 .../teleterm/src/services/pty/ptyHost/resolveShellEnv.ts        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/packages/teleterm/src/services/pty/ptyHost/resolveShellEnv.ts b/web/packages/teleterm/src/services/pty/ptyHost/resolveShellEnv.ts
index 7d2ac9e2a0db..36ce0ecd6417 100644
--- a/web/packages/teleterm/src/services/pty/ptyHost/resolveShellEnv.ts
+++ b/web/packages/teleterm/src/services/pty/ptyHost/resolveShellEnv.ts
@@ -98,7 +98,7 @@ async function resolveUnixShellEnv(
     // When bash is run with -c, it is considered a non-interactive shell, and it does not read ~/.bashrc, unless is -i specified.
     // https://unix.stackexchange.com/questions/277312/is-the-shell-created-by-bash-i-c-command-interactive
     const shellArgs =
-      shell === '/bin/tcsh' || shell === '/bin/csh' ? ['-ic'] : ['-cil'];
+      shell === '/bin/tcsh' || shell === '/bin/csh' ? ['-ic'] : ['-ilc'];
 
     logger.info(`Reading shell ${shell} ${shellArgs} ${command}`);