mirrors/kitty
1
0
Fork 0
mirror of https://github.com/kovidgoyal/kitty synced 2026-07-23 16:58:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

Dont set the EDITOR env var in child processes

Browse Source 
It isnt really needed, since the various kittens dont rely on it
anymore, instead calling get_editor() to get the path to the editor.
Has the nice side-effect of not needing to run the shell at startup
to read its environment. Now the shell is only run if the user calls
the edit config file kitten. Fixes #3426
This commit is contained in:
Kovid Goyal
2021-03-29 11:56:48 +05:30
parent 4edbe0ea4f
commit 1e6fe7785a
4 changed files with 62 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
kitty/main.py
View File

@@ -7,7 +7,7 @@ import os
import shutil
import sys
from contextlib import contextmanager, suppress
from typing import Dict, Generator, List, Mapping, Optional, Sequence
from typing import Dict, Generator, List, Optional, Sequence
from .borders import load_borders_program
from .boss import Boss
@@ -32,8 +32,8 @@ from .os_window_size import initial_window_size_func
from .session import get_os_window_sizing_data
from .types import SingleKey
from .utils import (
detach, expandvars, find_exe, log_error, read_shell_environment,
single_instance, startup_notification_handler, unix_socket_paths
detach, expandvars, log_error, single_instance,
startup_notification_handler, unix_socket_paths
)
from .window import load_shader_programs
@@ -225,39 +225,6 @@ def macos_cmdline(argv_args: List[str]) -> List[str]:
return ans
def resolve_editor_cmd(editor: str, shell_env: Mapping[str, str]) -> Optional[str]:
import shlex
editor_cmd = shlex.split(editor)
editor_exe = (editor_cmd or ('',))[0]
if editor_exe and os.path.isabs(editor_exe):
return editor
if not editor_exe:
return None
def patched(exe: str) -> str:
editor_cmd[0] = exe
return ' '.join(map(shlex.quote, editor_cmd))
if shell_env is os.environ:
q = find_exe(editor_exe)
if q:
return patched(q)
elif 'PATH' in shell_env:
import shlex
q = shutil.which(editor_exe, path=shell_env['PATH'])
if q:
return patched(q)
def get_editor_from_env(shell_env: Mapping[str, str]) -> Optional[str]:
for var in ('VISUAL', 'EDITOR'):
editor = shell_env.get(var)
if editor:
editor = resolve_editor_cmd(editor, shell_env)
if editor:
return editor
def expand_listen_on(listen_on: str, from_config_file: bool) -> str:
listen_on = expandvars(listen_on)
if '{kitty_pid}' not in listen_on and from_config_file:
@@ -275,15 +242,6 @@ def expand_listen_on(listen_on: str, from_config_file: bool) -> str:
def setup_environment(opts: OptionsStub, cli_opts: CLIOptions) -> None:
if opts.editor == '.':
editor = get_editor_from_env(os.environ)
if not editor:
shell_env = read_shell_environment(opts)
editor = get_editor_from_env(shell_env)
if editor:
os.environ['EDITOR'] = editor
else:
os.environ['EDITOR'] = opts.editor
from_config_file = False
if not cli_opts.listen_on and opts.listen_on.startswith('unix:'):
cli_opts.listen_on = opts.listen_on