Load conf.d first and source bindings after install. #272

This commit is contained in:
Jorge Bucaran 2016-05-10 21:32:45 +09:00
parent 299c1b985b
commit ecf0aebe13
No known key found for this signature in database
GPG key ID: E54BA3C0E646DB30

View file

@ -694,6 +694,32 @@ 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/completions/*.fish
set -l base (basename "$file")
set -l target "$fish_config/completions/$base"
command ln -sf "$file" "$target"
builtin source "$target" ^ /dev/null
end
for file in $path/{functions/*,}*.fish
set -l base (basename "$file")
@ -738,32 +764,6 @@ function __fisher_plugin_enable -a path
end
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/{functions/,}*.{py,awk}
set -l base (basename "$file")
command ln -sf "$file" "$fish_config/functions/$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"
command ln -sf "$file" "$target"
builtin source "$target" ^ /dev/null
end
return 0
end
@ -1402,6 +1402,8 @@ function __fisher_key_bindings_append -a plugin_name file
'
)
printf "%s\n" $plugin_key_bindings_source | source ^ /dev/null
printf "%s\n" $key_bindings_source $plugin_key_bindings_source | awk '
BEGIN {