github-mirror/oh-my-fish
github-mirror/oh-my-fish
2
0
Fork 0
mirror of https://github.com/oh-my-fish/oh-my-fish.git synced 2025-02-21 00:57:11 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Do not add test/spec files to function path via skip glob in import.

Browse Source
This commit is contained in:
Jorge Bucaran 2015-01-14 03:10:51 +09:00
parent 912315ba69
commit 4875576761
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
functions/_prepend_tree.fish
View File

@ -102,11 +102,6 @@ function _prepend_tree -d "Add a dependency tree to the Fish path."
printf "%s\n" $dir
end
# Do not add test/spec files to function path.
if contains -- (basename $dir) "test" "tests" "spec"
continue
end
# Prepend matched directory to the the global fish function path.
# Note path duplicates are already handled by _prepend_path.
_prepend_path $dir -d fish_function_path

12
functions/import.fish
View File

@ -12,7 +12,8 @@
# NOTES
# $fish_path and $fish_custom point to oh-my-fish home and the user
# 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
# import plugins/<plugin>
@ -25,14 +26,17 @@
# functions/_prepend_path.fish
# functions/_prepend_tree.fish
#
# v.0.1.0
# v.0.1.1
#/
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
# Prepend plugins, themes and completions, traversing library
# trees and prepending directories with fish code.
_prepend_tree $fish_path/$library
_prepend_tree $fish_custom/$library
_prepend_tree $fish_path/$library $skip_spec
_prepend_tree $fish_custom/$library $skip_spec
_prepend_path $fish_path/$library/completions -d fish_complete_path
# Set path to load files.