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

Loop through lines of tic output to correctly handle multiple lines

Browse Source
This commit is contained in:
Luflosi 2018-10-18 12:20:22 +02:00
parent a045ac3bd7
commit 88aab20376
No known key found for this signature in database
GPG Key ID: 14140F703B7D8362
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
setup.py
View File

@ -601,9 +601,9 @@ def package(args, for_bundle=False, sh_launcher=False):
safe_makedirs(odir) safe_makedirs(odir)
proc = subprocess.run(['tic', '-x', '-o' + odir, 'terminfo/kitty.terminfo'], check=True, stderr=subprocess.PIPE) proc = subprocess.run(['tic', '-x', '-o' + odir, 'terminfo/kitty.terminfo'], check=True, stderr=subprocess.PIPE)
regex = '^"terminfo/kitty.terminfo", line [0-9]+, col [0-9]+, terminal \'xterm-kitty\': older tic versions may treat the description field as an alias$' regex = '^"terminfo/kitty.terminfo", line [0-9]+, col [0-9]+, terminal \'xterm-kitty\': older tic versions may treat the description field as an alias$'
err_msg = proc.stderr.decode('utf-8').rstrip() for error in proc.stderr.decode('utf-8').splitlines():
if not re.match(regex, err_msg): if not re.match(regex, error):
print(err_msg, file=sys.stderr) print(error, file=sys.stderr)
if not glob.glob(os.path.join(odir, '*/xterm-kitty')): if not glob.glob(os.path.join(odir, '*/xterm-kitty')):
raise SystemExit('tic failed to output the compiled kitty terminfo file') raise SystemExit('tic failed to output the compiled kitty terminfo file')
shutil.copy2('__main__.py', libdir) shutil.copy2('__main__.py', libdir)