From 332f34564afe947aecb90dd22dc44bc3a26406c3 Mon Sep 17 00:00:00 2001 From: Jorge Bucaran Date: Fri, 5 Feb 2016 14:51:52 +0900 Subject: [PATCH] Fix: __fisher_plugin_walk was incorrectly traversing completions. Due to how the completions/*.fish path was traversed inside __fisher_plugin_walk, the plugin enable/disable mechanism would fail to copy all completions other than completions/.fish into the config. --- functions/__fisher_plugin_walk.fish | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/functions/__fisher_plugin_walk.fish b/functions/__fisher_plugin_walk.fish index 6310d34..7ddac59 100644 --- a/functions/__fisher_plugin_walk.fish +++ b/functions/__fisher_plugin_walk.fish @@ -3,6 +3,8 @@ function __fisher_plugin_walk -a plugin path set -l name (basename $file .fish) set -l base $name.fish + echo (set_color red)$file(set_color normal) > /dev/stderr + switch $file case \*/{fish_user_,}key_bindings.fish printf "%s %s %s\n" --bind $file @@ -10,6 +12,9 @@ function __fisher_plugin_walk -a plugin path case \?\*/uninstall.fish printf "%s %s\n" --uninstall $file + case \?\*/completions/\*.fish + printf "%s %s %s\n" --source $file completions/$base + case \?\*/{conf.d,modules}/\?\* \?\*/\*config.fish \?\*/{before.,}init.fish \*/$plugin.load switch "$base" case \*$plugin\* @@ -19,9 +24,6 @@ function __fisher_plugin_walk -a plugin path printf "%s %s %s\n" --source $file conf.d/$base - case \*/completions/$plugin.fish - printf "%s %s %s\n" --source $file completions/$base - case \* printf "%s %s %s %s\n" --source $file functions/$base $name end