diff options
| author | Robby Russell <robby@planetargon.com> | 2011-05-29 03:56:33 -0700 |
|---|---|---|
| committer | Robby Russell <robby@planetargon.com> | 2011-05-29 03:56:33 -0700 |
| commit | 142c03dbd223683fd2d99f878b68f0f075cf33fb (patch) | |
| tree | 48617a4669f0d993f22bca1e550d8c3af555fd02 /oh-my-zsh.sh | |
| parent | d708f5ddc1410a3adaa4d9aab025f1abf5054c9c (diff) | |
| parent | f8aae64e478066be7d05f5eb6970c356cafcfd36 (diff) | |
| download | zsh-142c03dbd223683fd2d99f878b68f0f075cf33fb.tar.gz zsh-142c03dbd223683fd2d99f878b68f0f075cf33fb.tar.bz2 zsh-142c03dbd223683fd2d99f878b68f0f075cf33fb.zip | |
Merge pull request #359 from theunraveler/master
Rewrite of plugin override
Diffstat (limited to 'oh-my-zsh.sh')
| -rw-r--r-- | oh-my-zsh.sh | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/oh-my-zsh.sh b/oh-my-zsh.sh index c8f1a33b8..dbff1ced9 100644 --- a/oh-my-zsh.sh +++ b/oh-my-zsh.sh @@ -17,7 +17,9 @@ compinit -i # Load all of the plugins that were defined in ~/.zshrc for plugin ($plugins); do - if [ -f $ZSH/plugins/$plugin/$plugin.plugin.zsh ]; then + if [ -f $ZSH/custom/plugins/$plugin/$plugin.plugin.zsh ]; then + source $ZSH/custom/plugins/$plugin/$plugin.plugin.zsh + elif [ -f $ZSH/plugins/$plugin/$plugin.plugin.zsh ]; then source $ZSH/plugins/$plugin/$plugin.plugin.zsh fi done |