diff options
| author | Robby Russell <robby@planetargon.com> | 2011-04-29 11:24:51 +0200 |
|---|---|---|
| committer | Robby Russell <robby@planetargon.com> | 2011-04-29 11:24:51 +0200 |
| commit | c8ac3356c8da5ba0290066309b0fcd16d223f187 (patch) | |
| tree | e61f7912d6a08d6bcee47d53e6bea4fb0bcf75e1 /oh-my-zsh.sh | |
| parent | 6f7d51c68d4de102f295d3b543ccb5c61dea2c3c (diff) | |
| parent | 17eba9e46c3478d1f5840a477228216bd2844fbc (diff) | |
| download | zsh-c8ac3356c8da5ba0290066309b0fcd16d223f187.tar.gz zsh-c8ac3356c8da5ba0290066309b0fcd16d223f187.tar.bz2 zsh-c8ac3356c8da5ba0290066309b0fcd16d223f187.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 | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/oh-my-zsh.sh b/oh-my-zsh.sh index 1e735b058..3ea88e924 100644 --- a/oh-my-zsh.sh +++ b/oh-my-zsh.sh @@ -7,12 +7,23 @@ fpath=($ZSH/functions $fpath) # TIP: Add files you don't want in git to .gitignore for config_file ($ZSH/lib/*.zsh) source $config_file -# Load all of your custom configurations from custom/ -for config_file ($ZSH/custom/*.zsh) source $config_file +# Add all defined plugins to fpath +plugin=${plugin:=()} +for plugin ($plugins) fpath=($ZSH/plugins/$plugin $fpath) + +# Load and run compinit +autoload -U compinit +compinit -i # Load all of the plugins that were defined in ~/.zshrc -plugin=${plugin:=()} -for plugin ($plugins) source $ZSH/plugins/$plugin/$plugin.plugin.zsh +for plugin ($plugins); do + if [ -f $ZSH/plugins/$plugin/$plugin.plugin.zsh ]; then + source $ZSH/plugins/$plugin/$plugin.plugin.zsh + fi +done + +# Load all of your custom configurations from custom/ +for config_file ($ZSH/custom/*.zsh) source $config_file # Load the theme # Check for updates on initial load... |