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

Fix the base path for envinclude

Browse Source
This commit is contained in:
pagedown 2022-12-05 14:27:50 +08:00
parent 9c488bb877
commit 30b25709d2
No known key found for this signature in database
GPG Key ID: E921CF18AC8FF6EB
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
kitty/conf/utils.py
View File

@ -206,7 +206,12 @@ def parse_line(
for x in os.environ:
if fnmatchcase(x, val):
with currently_parsing.set_file(f'<env var: {x}>'):
_parse(NamedLineIterator(base_path_for_includes, iter(os.environ[x].splitlines())), parse_conf_item, ans, accumulate_bad_lines)
_parse(
NamedLineIterator(os.path.join(base_path_for_includes, ''), iter(os.environ[x].splitlines())),
parse_conf_item,
ans,
accumulate_bad_lines
)
return
else:
if not os.path.isabs(val):
@ -240,7 +245,7 @@ def _parse(
) -> None:
name = getattr(lines, 'name', None)
if name:
base_path_for_includes = os.path.dirname(os.path.abspath(name))
base_path_for_includes = os.path.abspath(name) if name.endswith(os.path.sep) else os.path.dirname(os.path.abspath(name))
else:
from ..constants import config_dir
base_path_for_includes = config_dir