Skip to content

Commit

Permalink
Merge pull request ohmyzsh#1111 from jimeh/fix-ZSH_CUSTOM-variable
Browse files Browse the repository at this point in the history
Fix $ZSH_CUSTOM variable
  • Loading branch information
robbyrussell committed May 21, 2012
2 parents 1120f97 + f9018c5 commit e6fc2c6
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions oh-my-zsh.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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" ]
Expand All @@ -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

0 comments on commit e6fc2c6

Please sign in to comment.