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

use inherited instead of inherit

Browse Source
This commit is contained in:
Kovid Goyal 2022-03-06 09:54:33 +05:30
parent 482b853908
commit 31b01d42c0
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
kittens/ssh/main.py
View File

@ -78,7 +78,7 @@ def make_tarfile(ssh_opts: SSHOptions, base_env: Dict[str, str]) -> bytes:
return filter return filter
from kitty.shell_integration import get_effective_ksi_env_var from kitty.shell_integration import get_effective_ksi_env_var
if ssh_opts.shell_integration == 'inherit': if ssh_opts.shell_integration == 'inherited':
ksi = get_effective_ksi_env_var() ksi = get_effective_ksi_env_var()
else: else:
from kitty.options.types import Options from kitty.options.types import Options

4
kittens/ssh/options/definition.py
View File

@ -85,9 +85,9 @@ are installed. The location is relative to the HOME directory. Absolute paths or
that resolve to a location outside the HOME are not allowed. that resolve to a location outside the HOME are not allowed.
''') ''')
opt('shell_integration', 'inherit', long_text=''' opt('shell_integration', 'inherited', long_text='''
Control the shell integration on the remote host. See :ref:`shell_integration` Control the shell integration on the remote host. See :ref:`shell_integration`
for details on how this setting works. The special value :code:`inherit` means for details on how this setting works. The special value :code:`inherited` means
use the setting from kitty.conf. This setting is useful for overriding use the setting from kitty.conf. This setting is useful for overriding
integration on a per-host basis.''') integration on a per-host basis.''')

2
kittens/ssh/options/types.py
View File

@ -19,7 +19,7 @@ class Options:
interpreter: str = 'sh' interpreter: str = 'sh'
login_shell: str = '' login_shell: str = ''
remote_dir: str = '.local/share/kitty-ssh-kitten' remote_dir: str = '.local/share/kitty-ssh-kitten'
shell_integration: str = 'inherit' shell_integration: str = 'inherited'
copy: typing.Dict[str, kittens.ssh.copy.CopyInstruction] = {} copy: typing.Dict[str, kittens.ssh.copy.CopyInstruction] = {}
env: typing.Dict[str, str] = {} env: typing.Dict[str, str] = {}
config_paths: typing.Tuple[str, ...] = () config_paths: typing.Tuple[str, ...] = ()