KittyPatch/kitty
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

EXEC_CMD must come after login_shell detection since it can use login_shell

Browse Source
This commit is contained in:
Kovid Goyal 2022-03-04 10:00:12 +05:30
parent 64d6337612
commit e0c984046c
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
kittens/ssh/main.py
View File

@ -326,7 +326,7 @@ def get_posix_cmd(remote_args: List[str]) -> List[str]:
# line 1129 of ssh.c and on the remote side sshd.c runs the
# concatenated command as shell -c cmd
args = [c.replace("'", """'"'"'""") for c in remote_args]
command_to_execute = "exec $login_shell -c '{}'".format(' '.join(args))
command_to_execute = "exec \"$login_shell\" -c '{}'".format(' '.join(args))
sh_script = load_script(exec_cmd=command_to_execute)
return [f'sh -c {shlex.quote(sh_script)}']

15
shell-integration/ssh/bootstrap.sh
View File

@ -213,6 +213,14 @@ execute_with_python() {
return 1;
}
LOGIN_SHELL="OVERRIDE_LOGIN_SHELL"
if [ -n "$LOGIN_SHELL" ]; then
login_shell="$LOGIN_SHELL"
else
using_getent || using_id || using_python || using_passwd || die "Could not detect login shell";
fi
shell_name=$(basename $login_shell)
# If a command was passed to SSH execute it here
EXEC_CMD
@ -224,13 +232,6 @@ if [ "$tty_ok" = "n" ]; then
fi
fi
LOGIN_SHELL="OVERRIDE_LOGIN_SHELL"
if [ -n "$LOGIN_SHELL" ]; then
login_shell="$LOGIN_SHELL"
else
using_getent || using_id || using_python || using_passwd || die "Could not detect login shell";
fi
shell_name=$(basename $login_shell)
exec_bash_with_integration() {
export ENV="$shell_integration_dir/bash/kitty.bash"