Archives/oh-my-fish
2
0
Fork 0
mirror of https://github.com/oh-my-fish/oh-my-fish synced 2024-11-03 15:40:32 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #308 from bucaran/fix-prepend-tree-299

Browse Source 
Do not add test/spec files to function path in _prepend_tree.
This commit is contained in:
Bruno 2015-01-13 23:39:20 -02:00
commit 465e325abd
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
functions/import.fish
View File

@ -12,7 +12,8 @@
# NOTES # NOTES
# $fish_path and $fish_custom point to oh-my-fish home and the user # $fish_path and $fish_custom point to oh-my-fish home and the user
# dotfiles folder respectively. Both globals are usually configured # dotfiles folder respectively. Both globals are usually configured
# in ~/.config/fish/config.fish # in ~/.config/fish/config.fish. Also, import is clever enough to
# skip directories with *.spec.fish files.
# #
# EXAMPLES # EXAMPLES
# import plugins/<plugin> # import plugins/<plugin>
@ -25,14 +26,17 @@
# functions/_prepend_path.fish # functions/_prepend_path.fish
# functions/_prepend_tree.fish # functions/_prepend_tree.fish
# #
# v.0.1.0 # v.0.1.1
#/ #/
function import -d "Load libraries, plugins, themes, etc." function import -d "Load libraries, plugins, themes, etc."
# Do not add spec files to function path.
set -l skip_spec \*.fish -a ! \*.spec.fish
for library in $argv for library in $argv
# Prepend plugins, themes and completions, traversing library # Prepend plugins, themes and completions, traversing library
# trees and prepending directories with fish code. # trees and prepending directories with fish code.
_prepend_tree $fish_path/$library _prepend_tree $fish_path/$library $skip_spec
_prepend_tree $fish_custom/$library _prepend_tree $fish_custom/$library $skip_spec
_prepend_path $fish_path/$library/completions -d fish_complete_path _prepend_path $fish_path/$library/completions -d fish_complete_path
# Set path to load files. # Set path to load files.