diff options
| author | Henry Yan <yanhonglei@gmail.com> | 2012-07-17 00:36:50 +0800 |
|---|---|---|
| committer | Henry Yan <yanhonglei@gmail.com> | 2012-07-17 00:36:50 +0800 |
| commit | 4a11d2c35c7a526e648b37a5b02b7695be46b16a (patch) | |
| tree | 1eb542466758885ee40f3f60cc57d6438f38dc4d /oh-my-zsh.sh | |
| parent | e9feccf6a94f9f5238ff0b3501f62575d14ae148 (diff) | |
| parent | 11034217a7ea3cffe6e0fe631837c518b8c7e1a5 (diff) | |
| download | zsh-4a11d2c35c7a526e648b37a5b02b7695be46b16a.tar.gz zsh-4a11d2c35c7a526e648b37a5b02b7695be46b16a.tar.bz2 zsh-4a11d2c35c7a526e648b37a5b02b7695be46b16a.zip | |
merge from 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..ddef1ad6c 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 - |