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

When detecting the EDITOR from the environment, if the EDITOR env var is not present, try to read it from the shell's rc files by executing a login shell and dumping its environment

Browse Source 
macOS makes it unreasonably hard to set system-wide environment
variables, so this hack might be useful there.
This commit is contained in:
Kovid Goyal 2019-07-22 09:29:55 +05:30
parent 51453a54e4
commit 50e7351c73
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
kitty/main.py
View File

@ -203,9 +203,31 @@ def macos_cmdline(argv_args):
return ans
def read_shell_environment(opts):
if not hasattr(read_shell_environment, 'ans'):
import subprocess
from .session import resolved_shell
shell = resolved_shell(opts)
p = subprocess.Popen(shell + ['-l', '-c', 'env'], stdout=subprocess.PIPE)
raw = p.stdout.read()
if p.wait() == 0:
raw = raw.decode('utf-8', 'replace')
ans = read_shell_environment.ans = {}
for line in raw.splitlines():
k, v = line.partition('=')[::2]
if k and v:
ans[k] = v
return read_shell_environment.ans
def setup_environment(opts, args):
extra_env = opts.env.copy()
if opts.editor != '.':
if opts.editor == '.':
if 'EDITOR' not in os.environ:
shell_env = read_shell_environment(opts)
if 'EDITOR' in shell_env:
os.environ['EDITOR'] = shell_env['EDITOR']
else:
os.environ['EDITOR'] = opts.editor
if args.listen_on:
os.environ['KITTY_LISTEN_ON'] = args.listen_on