e6fc2c6748ab32430012d0d572fb06b6b3e6daca

Author
Robby Russell <robby@planetargon.com>
Committer
Robby Russell <robby@planetargon.com>
Date

Message

Merge pull request #1111 from jimeh/fix-ZSH_CUSTOM-variable

Fix $ZSH_CUSTOM variable

Diff

 1diff --git a/oh-my-zsh.sh b/oh-my-zsh.sh
 2index 732a403b74c7f04ee2f283feb5b851c19c173889..c2b6049cbcba4db8963673e6093690d6f1721b0e 100644
 3--- a/oh-my-zsh.sh
 4+++ b/oh-my-zsh.sh
 5@@ -51,7 +51,7 @@ for plugin ($plugins); do
 6 done
 7 
 8 # Load all of your custom configurations from custom/
 9-for config_file ($ZSH_CUSTOM/*.zsh) source $config_file
10+for config_file ($ZSH_CUSTOM/*.zsh(.N)) source $config_file
11 
12 # Load the theme
13 if [ "$ZSH_THEME" = "random" ]
14@@ -65,12 +65,11 @@ then
15 else
16   if [ ! "$ZSH_THEME" = ""  ]
17   then
18-    if [ -f "$ZSH/custom/$ZSH_THEME.zsh-theme" ]
19+    if [ -f "$ZSH_CUSTOM/$ZSH_THEME.zsh-theme" ]
20     then
21-      source "$ZSH/custom/$ZSH_THEME.zsh-theme"
22+      source "$ZSH_CUSTOM/$ZSH_THEME.zsh-theme"
23     else
24       source "$ZSH/themes/$ZSH_THEME.zsh-theme"
25     fi
26   fi
27 fi
28-