From 9cfa3dd0eac0dd3cfb0d00801e0c02edb920b96e Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Mon, 23 Jan 2017 09:29:23 +0530 Subject: [PATCH] Use tic when building linux-package instead of hard coding terminfo directory structure --- setup.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/setup.py b/setup.py index ceb63db51..c000bfd2e 100755 --- a/setup.py +++ b/setup.py @@ -217,16 +217,14 @@ def safe_makedirs(path): def package(args): # {{{ ddir = args.prefix libdir = os.path.join(ddir, 'lib', 'kitty') - terminfo_sdir = ('78' if isosx else 'x') - terminfo_dir = os.path.join(ddir, 'share/terminfo/' + terminfo_sdir) if os.path.exists(libdir): shutil.rmtree(libdir) - os.makedirs(os.path.join(libdir, 'terminfo/' + terminfo_sdir)) os.makedirs(os.path.join(libdir, 'logo')) - safe_makedirs(terminfo_dir) + for x in (libdir, os.path.join(ddir, 'share')): + odir = os.path.join(x, 'terminfo') + safe_makedirs(odir) + subprocess.check_call(['tic', '-o' + odir, 'terminfo/kitty.terminfo']) shutil.copy2('__main__.py', libdir) - shutil.copy2('terminfo/x/xterm-kitty', terminfo_dir) - shutil.copy2('terminfo/x/xterm-kitty', os.path.join(libdir, 'terminfo/' + terminfo_sdir)) shutil.copy2('logo/kitty.rgba', os.path.join(libdir, 'logo')) def src_ignore(parent, entries):