diff options
| author | Robby Russell <robby@planetargon.com> | 2015-06-14 21:46:41 -0700 |
|---|---|---|
| committer | Robby Russell <robby@planetargon.com> | 2015-06-14 21:46:41 -0700 |
| commit | 78bbf7a6e52e7aabc82f22c43c9309a5f0ff1282 (patch) | |
| tree | 6a2a6374797c0f303a293cd17547349a617c7404 /oh-my-zsh.sh | |
| parent | 9eaf51107f15011f73b39fb727895f65797edcbc (diff) | |
| parent | a7e79824f85a89cbcacbceab0277c9833dee4817 (diff) | |
| download | zsh-78bbf7a6e52e7aabc82f22c43c9309a5f0ff1282.tar.gz zsh-78bbf7a6e52e7aabc82f22c43c9309a5f0ff1282.tar.bz2 zsh-78bbf7a6e52e7aabc82f22c43c9309a5f0ff1282.zip | |
Merge pull request #3809 from ncanceill/easymerge
Easy-to-Merge
Diffstat (limited to 'oh-my-zsh.sh')
| -rw-r--r-- | oh-my-zsh.sh | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/oh-my-zsh.sh b/oh-my-zsh.sh index bc7a8e496..ec64c240f 100644 --- a/oh-my-zsh.sh +++ b/oh-my-zsh.sh @@ -14,7 +14,7 @@ if [[ -z "$ZSH_CUSTOM" ]]; then ZSH_CUSTOM="$ZSH/custom" fi -# Set ZSH_CACHE_DIR to the path where cache files sould be created +# Set ZSH_CACHE_DIR to the path where cache files should be created # or else we will use the default cache/ if [[ -z "$ZSH_CACHE_DIR" ]]; then ZSH_CACHE_DIR="$ZSH/cache/" @@ -29,6 +29,11 @@ for config_file ($ZSH/lib/*.zsh); do source $config_file done +# Load all of your custom configurations from custom/ +for config_file ($ZSH_CUSTOM/*.zsh(N)); do + source $config_file +done +unset config_file is_plugin() { local base_dir=$1 @@ -72,12 +77,6 @@ for plugin ($plugins); do fi done -# Load all of your custom configurations from custom/ -for config_file ($ZSH_CUSTOM/*.zsh(N)); do - source $config_file -done -unset config_file - # Load the theme if [ "$ZSH_THEME" = "random" ]; then themes=($ZSH/themes/*zsh-theme) |