diff options
| author | Alex Leferry 2 <alexherbo2@gmail.com> | 2020-01-14 22:50:08 +0100 |
|---|---|---|
| committer | Alex Leferry 2 <alexherbo2@gmail.com> | 2020-01-15 17:52:48 +0100 |
| commit | 7cbea89b959e37b3222c16dba3ca9804562f45fa (patch) | |
| tree | 98c0acf16ec2a9adf9830d8895b2cf831a8fdfe7 | |
| parent | 6226109c8d8e8fc9a9e0486a6e239d354b825ac4 (diff) | |
Override SHELL with kak_client_env_SHELL
| -rw-r--r-- | rc/connect.kak | 8 | ||||
| -rw-r--r-- | rc/env/overrides.env | 1 |
2 files changed, 5 insertions, 4 deletions
diff --git a/rc/connect.kak b/rc/connect.kak index c1399a5..fdf92ed 100644 --- a/rc/connect.kak +++ b/rc/connect.kak @@ -3,17 +3,17 @@ declare-option -hidden str connect_path %sh(dirname "$kak_source") provide-module connect %{ define-command connect-terminal -params .. -docstring 'Connect a terminal' %{ terminal sh -c %{ - kak_opt_connect_path=$1 kak_session=$2 kak_client=$3 + kak_opt_connect_path=$1 kak_session=$2 kak_client=$3 kak_client_env_SHELL=$4 . "$kak_opt_connect_path/env/default.env" . "$kak_opt_connect_path/env/overrides.env" . "$kak_opt_connect_path/env/kakoune.env" - shift 3 + shift 4 "${@:-$SHELL}" - } -- %opt{connect_path} %val{session} %val{client} %arg{@} + } -- %opt{connect_path} %val{session} %val{client} %val{client_env_SHELL} %arg{@} } define-command connect-shell -params 1.. -docstring 'Connect a shell' %{ nop %sh{ - # kak_opt_connect_path kak_session kak_client + # kak_opt_connect_path kak_session kak_client kak_client_env_SHELL . "$kak_opt_connect_path/env/default.env" . "$kak_opt_connect_path/env/overrides.env" . "$kak_opt_connect_path/env/kakoune.env" diff --git a/rc/env/overrides.env b/rc/env/overrides.env index 0b3fca2..f8387d3 100644 --- a/rc/env/overrides.env +++ b/rc/env/overrides.env @@ -1,5 +1,6 @@ export ORIGINAL_PATH=$PATH # aliases, commands, paths, tools PATH=$kak_opt_connect_path/paths/aliases:$kak_opt_connect_path/paths/commands:$PATH:$kak_opt_connect_path/paths/tools +SHELL=$kak_client_env_SHELL VISUAL=edit EDITOR=edit |