diff --git a/fisher.fish b/fisher.fish index 3a571ae..2066e67 100644 --- a/fisher.fish +++ b/fisher.fish @@ -708,24 +708,6 @@ end function __fisher_plugin_enable -a path set -l plugin_name (basename $path) - for file in $path/conf.d/*.{py,awk} - set -l base (basename "$file") - command ln -sf "$file" "$fish_config/conf.d/$base" - end - - for file in $path/conf.d/*.fish - set -l base (basename "$file") - set -l target "$fish_config/conf.d/$base" - - command ln -sf "$file" "$target" - builtin source "$target" ^ /dev/null - end - - for file in $path/{functions/,}*.{py,awk} - set -l base (basename "$file") - command ln -sf "$file" "$fish_config/functions/$base" - end - for file in $path/{functions/*,}*.fish set -l base (basename "$file") @@ -771,6 +753,24 @@ function __fisher_plugin_enable -a path end end + for file in $path/{functions/,}*.{py,awk} + set -l base (basename "$file") + command ln -sf "$file" "$fish_config/functions/$base" + end + + for file in $path/conf.d/*.{py,awk} + set -l base (basename "$file") + command ln -sf "$file" "$fish_config/conf.d/$base" + end + + for file in $path/conf.d/*.fish + set -l base (basename "$file") + set -l target "$fish_config/conf.d/$base" + + command ln -sf "$file" "$target" + builtin source "$target" ^ /dev/null + end + for file in $path/completions/*.fish set -l base (basename "$file") set -l target "$fish_config/completions/$base"