From bc9d6892d4d134faa439c53cf246278e8e7b2926 Mon Sep 17 00:00:00 2001
From: pagedown <pg.dn@outlook.com>
Date: Thu, 24 Mar 2022 22:00:51 +0800
Subject: [PATCH] Clean up login shell environment variable earlier

Does not pollute the environment when executing commands.
---
 shell-integration/ssh/bootstrap-utils.sh | 7 +------
 shell-integration/ssh/bootstrap.sh       | 3 +++
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/shell-integration/ssh/bootstrap-utils.sh b/shell-integration/ssh/bootstrap-utils.sh
index ad7b91e15..c6931c4b8 100644
--- a/shell-integration/ssh/bootstrap-utils.sh
+++ b/shell-integration/ssh/bootstrap-utils.sh
@@ -178,12 +178,7 @@ prepare_for_exec() {
     fi
     [ -f "$HOME/.terminfo/kitty.terminfo" ] || die "Incomplete extraction of ssh data"
 
-    if [ -n "$KITTY_LOGIN_SHELL" ]; then
-        login_shell="$KITTY_LOGIN_SHELL"
-        unset KITTY_LOGIN_SHELL
-    else
-        using_getent || using_id || using_python || using_perl || using_passwd || using_shell_env || login_shell="sh"
-    fi
+    [ -n "$login_shell" ] || using_getent || using_id || using_python || using_perl || using_passwd || using_shell_env || login_shell="sh"
     shell_name=$(command basename $login_shell)
     [ -n "$login_cwd" ] && cd "$login_cwd"
 }
diff --git a/shell-integration/ssh/bootstrap.sh b/shell-integration/ssh/bootstrap.sh
index 222c0c46b..e0c15f59c 100644
--- a/shell-integration/ssh/bootstrap.sh
+++ b/shell-integration/ssh/bootstrap.sh
@@ -71,6 +71,7 @@ EXPORT_HOME_CMD
 [ -z "$USER" ] && USER="$(command whoami 2> /dev/null)"
 
 leading_data=""
+login_shell=""
 login_cwd=""
 
 request_data="REQUEST_DATA"
@@ -100,6 +101,8 @@ untar_and_read_env() {
     data_dir="$HOME/$KITTY_SSH_KITTEN_DATA_DIR"
     shell_integration_dir="$data_dir/shell-integration"
     unset KITTY_SSH_KITTEN_DATA_DIR
+    login_shell="$KITTY_LOGIN_SHELL"
+    unset KITTY_LOGIN_SHELL
     login_cwd="$KITTY_LOGIN_CWD"
     unset KITTY_LOGIN_CWD
     compile_terminfo "$tdir/home"