summaryrefslogtreecommitdiff
path: root/oh-my-zsh.sh
diff options
context:
space:
mode:
authorChristian Höltje <docwhat@gerf.org>2011-11-16 09:25:45 -0500
committerChristian Höltje <docwhat@gerf.org>2011-11-16 09:27:34 -0500
commit3512eca2cefee9b89b08230021c25f6e30525e31 (patch)
tree92fd0ecf30745bfedae3f922eaf6dffedf660a2a /oh-my-zsh.sh
parent757fa3314d1c041ab715dbda838f3e9b2ff9ce17 (diff)
downloadzsh-3512eca2cefee9b89b08230021c25f6e30525e31.tar.gz
zsh-3512eca2cefee9b89b08230021c25f6e30525e31.tar.bz2
zsh-3512eca2cefee9b89b08230021c25f6e30525e31.zip
set fpath correctly for custom plugins
Custom plugins weren't being added to the fpath correctly.
Diffstat (limited to 'oh-my-zsh.sh')
-rw-r--r--oh-my-zsh.sh11
1 files changed, 9 insertions, 2 deletions
diff --git a/oh-my-zsh.sh b/oh-my-zsh.sh
index 891e8d467..8f5e2472d 100644
--- a/oh-my-zsh.sh
+++ b/oh-my-zsh.sh
@@ -13,9 +13,16 @@ fpath=($ZSH/functions $ZSH/completions $fpath)
# TIP: Add files you don't want in git to .gitignore
for config_file ($ZSH/lib/*.zsh) source $config_file
-# Add all defined plugins to fpath
+# Add all defined plugins to fpath. This must be done
+# before running compinit.
plugin=${plugin:=()}
-for plugin ($plugins) fpath=($ZSH/plugins/$plugin $fpath)
+for plugin ($plugins); do
+ if [ -f $ZSH_CUSTOM/plugins/$plugin/$plugin.plugin.zsh ]; then
+ fpath=($ZSH_CUSTOM/plugins/$plugin $fpath)
+ elif [ -f $ZSH/plugins/$plugin/$plugin.plugin.zsh ]; then
+ fpath=($ZSH/plugins/$plugin $fpath)
+ fi
+done
# Load and run compinit
autoload -U compinit