diff options
| author | Robby Russell <robby@planetargon.com> | 2011-06-01 09:33:49 +0200 |
|---|---|---|
| committer | Robby Russell <robby@planetargon.com> | 2011-06-01 09:33:49 +0200 |
| commit | 7b0b83623fb54d21932014c9a6267e6dc03976db (patch) | |
| tree | 9eac51c8ae668ec67a326710cd863f6717e723f6 /oh-my-zsh.sh | |
| parent | 23a082df129b12b6edf8ea04432b0cb2be0588fd (diff) | |
| parent | 643a4e77f639c1742d1ce01d8028649ae12f8e62 (diff) | |
| download | zsh-7b0b83623fb54d21932014c9a6267e6dc03976db.tar.gz zsh-7b0b83623fb54d21932014c9a6267e6dc03976db.tar.bz2 zsh-7b0b83623fb54d21932014c9a6267e6dc03976db.zip | |
Merge branch 'master' of github.com:robbyrussell/oh-my-zsh
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 |