diff options
| author | Robby Russell <robby@planetargon.com> | 2012-05-20 19:45:12 -0700 |
|---|---|---|
| committer | Robby Russell <robby@planetargon.com> | 2012-05-20 19:45:12 -0700 |
| commit | e6fc2c6748ab32430012d0d572fb06b6b3e6daca (patch) | |
| tree | c9b2e2cf3a2c2189e15bcdfe2a166e3cce9c2597 | |
| parent | 1120f973054836eeb53750f57d69fbec41a340dc (diff) | |
| parent | f9018c5efbb6cf164139009eff1863837d72b412 (diff) | |
| download | zsh-e6fc2c6748ab32430012d0d572fb06b6b3e6daca.tar.gz zsh-e6fc2c6748ab32430012d0d572fb06b6b3e6daca.tar.bz2 zsh-e6fc2c6748ab32430012d0d572fb06b6b3e6daca.zip | |
Merge pull request #1111 from jimeh/fix-ZSH_CUSTOM-variable
Fix $ZSH_CUSTOM variable
| -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 - |