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

Fix SHELL env var in open-actions.conf and launch-actions.conf

Browse Source 
Only the executable path is used when expanding `$SHELL`.
Also fix the non-working example `{SHELL}` in the documentation.
This commit is contained in:
pagedown 2023-01-23 14:15:27 +08:00
parent 1f00c27097
commit 352f940010
No known key found for this signature in database
GPG Key ID: E921CF18AC8FF6EB
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
docs/open_actions.rst
View File

@ -68,6 +68,13 @@ some special variables, documented below:
The path, query and fragment portions of the URL, without any The path, query and fragment portions of the URL, without any
unquoting. unquoting.
``EDITOR``
The terminal based text editor. The configured :opt:`editor` in
:file:`kitty.conf` is preferred.
``SHELL``
The path to the shell. The configured :opt:`shell` in :file:`kitty.conf` is
preferred, without arguments.
.. note:: .. note::
You can use the :opt:`action_alias` option just as in :file:`kitty.conf` to You can use the :opt:`action_alias` option just as in :file:`kitty.conf` to

7
kitty/open_actions.py
View File

@ -74,7 +74,7 @@ def parse(lines: Iterable[str]) -> Iterator[OpenAction]:
with to_cmdline_implementation.filter_env_vars( with to_cmdline_implementation.filter_env_vars(
'URL', 'FILE_PATH', 'FILE', 'FRAGMENT', 'URL_PATH', 'URL', 'FILE_PATH', 'FILE', 'FRAGMENT', 'URL_PATH',
EDITOR=shlex.join(get_editor()), EDITOR=shlex.join(get_editor()),
SHELL=shlex.join(resolved_shell(get_options())) SHELL=resolved_shell(get_options())[0]
): ):
for (mc, action_defns) in entries: for (mc, action_defns) in entries:
actions: List[KeyAction] = [] actions: List[KeyAction] = []
@ -234,12 +234,11 @@ action show_kitty_doc $URL_PATH
@run_once @run_once
def default_launch_actions() -> Tuple[OpenAction, ...]: def default_launch_actions() -> Tuple[OpenAction, ...]:
SHELL = resolved_shell(get_options()) return tuple(parse('''\
return tuple(parse(f'''\
# Open script files # Open script files
protocol file protocol file
ext sh,command,tool ext sh,command,tool
action launch --hold --type=os-window kitty +shebang $FILE_PATH {SHELL} action launch --hold --type=os-window kitty +shebang $FILE_PATH $SHELL
# Open shell specific script files # Open shell specific script files
protocol file protocol file