Commit 16888838 authored by Jorge Bucaran's avatar Jorge Bucaran

Fix import not getting passed the correct passed in `oh-my-fish.fish`.

To import plugins or load themes:

 + import plugins/<plugin>
 + import plugins/{dpaste,cask} themes/bobthefish

Note: Plugins/Themes can be in either `custom/plugins`, `custom/themes` or `$fish_path/plugins/`, `$fish_path/themes/`.
parent 1c795f0e
...@@ -91,8 +91,8 @@ function _prepend_tree -d "Add a dependency tree to the Fish path." ...@@ -91,8 +91,8 @@ function _prepend_tree -d "Add a dependency tree to the Fish path."
# Traverse $path and $subs prepending only directories with matches. # Traverse $path and $subs prepending only directories with matches.
for dir in $path $subs for dir in $path $subs
# Use head to retrieve at least one match. Ignore errors for non # Use head to retrieve at least one match. Skip not found errors
# existing directories # for directories that do not exist.
if [ -z (find "$dir" $glob -maxdepth 1 ^/dev/null | head -1) ] if [ -z (find "$dir" $glob -maxdepth 1 ^/dev/null | head -1) ]
continue continue
end end
......
...@@ -15,7 +15,8 @@ ...@@ -15,7 +15,8 @@
# in ~/.config/fish/config.fish # in ~/.config/fish/config.fish
# #
# EXAMPLES # EXAMPLES
# import dpaste cask themes/bobthefish # import plugins/<plugin>
# import plugins/{dpaste,cask} themes/bobthefish
# #
# AUTHORS # AUTHORS
# Jorge Bucaran <jbucaran@me.com> # Jorge Bucaran <jbucaran@me.com>
......
...@@ -20,7 +20,7 @@ end ...@@ -20,7 +20,7 @@ end
# a directory under $fish_path/custom/themes with the same name as # a directory under $fish_path/custom/themes with the same name as
# the theme and override any functions/variables there. Rinse and # the theme and override any functions/variables there. Rinse and
# repeat for plugins. # repeat for plugins.
import $fish_plugins themes/$fish_theme import plugins/$fish_plugins themes/$fish_theme
# Source all files inside custom directory. # Source all files inside custom directory.
for load in $fish_custom/*.load for load in $fish_custom/*.load
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment