mirrors/kitty
1
0
Fork 0
mirror of https://github.com/kovidgoyal/kitty synced 2026-07-28 03:01:57 +02:00
Code Issues Packages Projects Releases Wiki Activity

Also restore cwd when serializing direct ssh kitten invocations

Browse Source
This commit is contained in:
Kovid Goyal
2025-08-22 21:43:56 +05:30
parent 36163fd532
commit 0b8488aa65
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
kitty/window.py
View File

@@ -2015,10 +2015,16 @@ class Window:
t = 'overlay-main' if self.overlay_type is OverlayType.main else 'overlay' t = 'overlay-main' if self.overlay_type is OverlayType.main else 'overlay'
ans.append(f'--type={t}') ans.append(f'--type={t}')
from kittens.ssh.utils import is_kitten_cmdline as is_ssh_kitten_cmdline
from kittens.ssh.utils import remove_env_var_from_cmdline, set_cwd_in_cmdline, set_single_env_var_in_cmdline
cmd: list[str] = [] cmd: list[str] = []
if self.creation_spec and self.creation_spec.cmd: if self.creation_spec and self.creation_spec.cmd:
if self.creation_spec.cmd != resolved_shell(get_options()): if self.creation_spec.cmd != resolved_shell(get_options()):
cmd = self.creation_spec.cmd cmd = self.creation_spec.cmd
if is_ssh_kitten_cmdline(cmd):
if self.at_prompt:
if self.screen.last_reported_cwd:
set_cwd_in_cmdline(path_from_osc7_url(self.screen.last_reported_cwd), cmd)
unserialize_data: dict[str, int | list[str] | str] = {'id': self.id} unserialize_data: dict[str, int | list[str] | str] = {'id': self.id}
if not cmd and ser_opts.use_foreground_process: if not cmd and ser_opts.use_foreground_process:
def make_exe_absolute(cmd: list[str], pid: int) -> None: def make_exe_absolute(cmd: list[str], pid: int) -> None:
@@ -2028,7 +2034,6 @@ class Window:
cmd[0] = abspath_of_exe(pid) cmd[0] = abspath_of_exe(pid)
kssh_cmdline = self.ssh_kitten_cmdline() kssh_cmdline = self.ssh_kitten_cmdline()
if kssh_cmdline: if kssh_cmdline:
from kittens.ssh.utils import remove_env_var_from_cmdline, set_cwd_in_cmdline, set_single_env_var_in_cmdline
remove_env_var_from_cmdline('KITTY_SI_RUN_COMMAND_AT_STARTUP', kssh_cmdline) remove_env_var_from_cmdline('KITTY_SI_RUN_COMMAND_AT_STARTUP', kssh_cmdline)
if self.at_prompt: if self.at_prompt:
if self.screen.last_reported_cwd: if self.screen.last_reported_cwd: