diff options
| author | Sébastien M-B <essembeh@gmail.com> | 2012-06-05 14:09:19 +0200 |
|---|---|---|
| committer | Sébastien M-B <essembeh@gmail.com> | 2012-06-05 14:09:19 +0200 |
| commit | 579f33d489c8b61e77279894cd467c3207955c09 (patch) | |
| tree | 4b2fa8dc5122c723c60bdfe5f33809657171d6f3 /oh-my-zsh.sh | |
| parent | 741388be00fb88b7680e0faa328adf5a86e1f65f (diff) | |
| parent | caa15548c107b9c31f61a67547ffab0b0cfe4934 (diff) | |
| download | zsh-579f33d489c8b61e77279894cd467c3207955c09.tar.gz zsh-579f33d489c8b61e77279894cd467c3207955c09.tar.bz2 zsh-579f33d489c8b61e77279894cd467c3207955c09.zip | |
Merge remote branch 'upstream/master'
Diffstat (limited to 'oh-my-zsh.sh')
| -rw-r--r-- | oh-my-zsh.sh | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/oh-my-zsh.sh b/oh-my-zsh.sh index 732a403b7..c2b6049cb 100644 --- a/oh-my-zsh.sh +++ b/oh-my-zsh.sh @@ -51,7 +51,7 @@ for plugin ($plugins); do done # Load all of your custom configurations from custom/ -for config_file ($ZSH_CUSTOM/*.zsh) source $config_file +for config_file ($ZSH_CUSTOM/*.zsh(.N)) source $config_file # Load the theme if [ "$ZSH_THEME" = "random" ] @@ -65,12 +65,11 @@ then else if [ ! "$ZSH_THEME" = "" ] then - if [ -f "$ZSH/custom/$ZSH_THEME.zsh-theme" ] + if [ -f "$ZSH_CUSTOM/$ZSH_THEME.zsh-theme" ] then - source "$ZSH/custom/$ZSH_THEME.zsh-theme" + source "$ZSH_CUSTOM/$ZSH_THEME.zsh-theme" else source "$ZSH/themes/$ZSH_THEME.zsh-theme" fi fi fi - |