h/fish-shell
1
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2026-06-04 07:21:14 -03:00
Code Issues Packages Projects Releases Wiki Activity

__fish_config_interactive: Use variable-as-command

Browse Source 
This removes a use of eval, and some duplication.
This commit is contained in:
Fabian Homborg
2018-10-21 15:31:49 +02:00
parent 09f77a355f
commit fc51c156cb
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
share/functions/__fish_config_interactive.fish
View File

@@ -126,12 +126,11 @@ function __fish_config_interactive -d "Initializations that should be performed
# Hence we'll call python directly.
# c_m_p.py should work with any python version.
set -l update_args -B $__fish_data_dir/tools/create_manpage_completions.py --manpath --cleanup-in '~/.config/fish/completions' --cleanup-in '~/.config/fish/generated_completions'
if command -qs python3
python3 $update_args >/dev/null 2>/dev/null &
else if command -qs python2
python2 $update_args >/dev/null 2>/dev/null &
else if command -qs python
python $update_args >/dev/null 2>/dev/null &
for py in python{3,2,}
if command -sq $py
$py $update_args >/dev/null 2>&1 &
break
end
end
end
end
@@ -228,7 +227,7 @@ function __fish_config_interactive -d "Initializations that should be performed
# Redirect stderr per #1155
fish_default_key_bindings 2>/dev/null
else
eval $fish_key_bindings 2>/dev/null
$fish_key_bindings 2>/dev/null
end
# Load user key bindings if they are defined
if functions --query fish_user_key_bindings >/dev/null