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

Allow overriding the location of the kitty base directory in frozen builds

Browse Source
This commit is contained in:
Kovid Goyal 2021-02-16 10:29:19 +05:30
parent 7eb8e1df79
commit c244bcd978
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
kitty/constants.py
View File

@ -24,14 +24,17 @@ version: Version = Version(0, 19, 3)
str_version: str = '.'.join(map(str, version)) str_version: str = '.'.join(map(str, version))
_plat = sys.platform.lower() _plat = sys.platform.lower()
is_macos: bool = 'darwin' in _plat is_macos: bool = 'darwin' in _plat
kitty_lib_dir = os.path.dirname(os.path.abspath(__file__)) if hasattr(sys, 'kitty_base_dir'):
kitty_base_dir: str = getattr(sys, 'kitty_base_dir')
else:
kitty_base_dir = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
@run_once @run_once
def kitty_exe() -> str: def kitty_exe() -> str:
rpath = sys._xoptions.get('bundle_exe_dir') rpath = sys._xoptions.get('bundle_exe_dir')
if not rpath: if not rpath:
items = os.environ.get('PATH', '').split(os.pathsep) + [os.path.join(kitty_lib_dir, 'launcher')] items = os.environ.get('PATH', '').split(os.pathsep) + [os.path.join(kitty_base_dir, 'kitty', 'launcher')]
seen: Set[str] = set() seen: Set[str] = set()
for candidate in filter(None, items): for candidate in filter(None, items):
if candidate not in seen: if candidate not in seen:
@ -113,10 +116,9 @@ def wakeup() -> None:
b.child_monitor.wakeup() b.child_monitor.wakeup()
base_dir = os.path.dirname(kitty_lib_dir) terminfo_dir = os.path.join(kitty_base_dir, 'terminfo')
terminfo_dir = os.path.join(base_dir, 'terminfo') logo_png_file = os.path.join(kitty_base_dir, 'logo', 'kitty.png')
logo_png_file = os.path.join(base_dir, 'logo', 'kitty.png') beam_cursor_data_file = os.path.join(kitty_base_dir, 'logo', 'beam-cursor.png')
beam_cursor_data_file = os.path.join(base_dir, 'logo', 'beam-cursor.png')
try: try:
shell_path = pwd.getpwuid(os.geteuid()).pw_shell or '/bin/sh' shell_path = pwd.getpwuid(os.geteuid()).pw_shell or '/bin/sh'
except KeyError: except KeyError:
@ -126,7 +128,7 @@ except KeyError:
def glfw_path(module: str) -> str: def glfw_path(module: str) -> str:
return os.path.join(kitty_lib_dir, 'glfw-{}.so'.format(module)) return os.path.join(kitty_base_dir, 'kitty', 'glfw-{}.so'.format(module))
def detect_if_wayland_ok() -> bool: def detect_if_wayland_ok() -> bool: