From e410d475655e68628279aa1286a2a21ffa5fadf0 Mon Sep 17 00:00:00 2001 From: Fabian Homborg Date: Thu, 20 Apr 2017 13:37:27 +0200 Subject: [PATCH] fish_config: Pick a python Also remove a use of `eval` and `string escape`. Fixes #3970. --- share/functions/fish_config.fish | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/share/functions/fish_config.fish b/share/functions/fish_config.fish index 48b113c78..4684fc351 100644 --- a/share/functions/fish_config.fish +++ b/share/functions/fish_config.fish @@ -1,9 +1,10 @@ function fish_config --description "Launch fish's web based configuration" - # Support passing an initial tab like "colors" or "functions" - set -l initial_tab - if count $argv >/dev/null - set initial_tab $argv[1] + set -lx __fish_bin_dir $__fish_bin_dir + if command -sq python3 + python3 "$__fish_datadir/tools/web_config/webconfig.py" $argv + else if command -sq python2 + python2 "$__fish_datadir/tools/web_config/webconfig.py" $argv + else if command -sq python + python "$__fish_datadir/tools/web_config/webconfig.py" $argv end - set -x __fish_bin_dir $__fish_bin_dir - eval (string escape $__fish_datadir/tools/web_config/webconfig.py) $initial_tab end