From d3472966d3e863fc0ad79eeedac8a2dbf15dc58a Mon Sep 17 00:00:00 2001 From: pagedown Date: Wed, 16 Mar 2022 09:15:31 +0800 Subject: [PATCH] Fix generating terminfo on NetBSD --- shell-integration/ssh/bootstrap.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/shell-integration/ssh/bootstrap.py b/shell-integration/ssh/bootstrap.py index 5ec35019d..3d3248e7d 100644 --- a/shell-integration/ssh/bootstrap.py +++ b/shell-integration/ssh/bootstrap.py @@ -137,7 +137,13 @@ def compile_terminfo(base): if not tic: return tname = '.terminfo' + q = os.path.join(base, tname, '78', 'xterm-kitty') + if not os.path.exists(q): + os.makedirs(os.path.dirname(q), exist_ok=True) + os.symlink('../x/xterm-kitty', q) if os.path.exists('/usr/share/misc/terminfo.cdb'): + # NetBSD requires this + os.symlink('../../.terminfo.cdb', os.path.join(base, tname, 'x', 'xterm-kitty')) tname += '.cdb' os.environ['TERMINFO'] = os.path.join(HOME, tname) p = subprocess.Popen( @@ -148,10 +154,6 @@ def compile_terminfo(base): if rc != 0: getattr(sys.stderr, 'buffer', sys.stderr).write(p.stdout) raise SystemExit('Failed to compile the terminfo database') - q = os.path.join(base, tname, '78', 'xterm-kitty') - if not os.path.exists(q): - os.makedirs(os.path.dirname(q), exist_ok=True) - os.symlink('../x/xterm-kitty', q) def iter_base64_data(f):