diff options
| author | Roman Kamyk <roman.kamyk@gmail.com> | 2011-09-15 12:56:40 +0200 |
|---|---|---|
| committer | Roman Kamyk <roman.kamyk@gmail.com> | 2011-09-15 12:56:40 +0200 |
| commit | 2b55ee07534ec34a699805dc35ca83ad8e22fc7a (patch) | |
| tree | 97f464ca865626aea1aa135e7eb9f629f4017171 /oh-my-zsh.sh | |
| parent | f71647fa85267d558d0d69034902f53aeeed67ad (diff) | |
| parent | 762b55bb2bc0452ce3f5f2f21bc22b61936ef704 (diff) | |
| download | zsh-2b55ee07534ec34a699805dc35ca83ad8e22fc7a.tar.gz zsh-2b55ee07534ec34a699805dc35ca83ad8e22fc7a.tar.bz2 zsh-2b55ee07534ec34a699805dc35ca83ad8e22fc7a.zip | |
Merge branch 'master' of http://github.com/robbyrussell/oh-my-zsh
Diffstat (limited to 'oh-my-zsh.sh')
| -rw-r--r-- | oh-my-zsh.sh | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/oh-my-zsh.sh b/oh-my-zsh.sh index 3ea88e924..c4522491b 100644 --- a/oh-my-zsh.sh +++ b/oh-my-zsh.sh @@ -1,7 +1,13 @@ +# Check for updates on initial load... +if [ "$DISABLE_AUTO_UPDATE" != "true" ] +then + /usr/bin/env zsh $ZSH/tools/check_for_upgrade.sh +fi + # Initializes Oh My Zsh # add a function path -fpath=($ZSH/functions $fpath) +fpath=($ZSH/functions $ZSH/completions $fpath) # Load all of the config files in ~/oh-my-zsh that end in .zsh # TIP: Add files you don't want in git to .gitignore @@ -17,7 +23,9 @@ compinit -i # Load all of the plugins that were defined in ~/.zshrc for plugin ($plugins); do - if [ -f $ZSH/plugins/$plugin/$plugin.plugin.zsh ]; then + if [ -f $ZSH/custom/plugins/$plugin/$plugin.plugin.zsh ]; then + source $ZSH/custom/plugins/$plugin/$plugin.plugin.zsh + elif [ -f $ZSH/plugins/$plugin/$plugin.plugin.zsh ]; then source $ZSH/plugins/$plugin/$plugin.plugin.zsh fi done @@ -26,24 +34,18 @@ done for config_file ($ZSH/custom/*.zsh) source $config_file # Load the theme -# Check for updates on initial load... if [ "$ZSH_THEME" = "random" ] then themes=($ZSH/themes/*zsh-theme) N=${#themes[@]} - ((N=RANDOM%N)) + ((N=(RANDOM%N)+1)) RANDOM_THEME=${themes[$N]} source "$RANDOM_THEME" echo "[oh-my-zsh] Random theme '$RANDOM_THEME' loaded..." else - source "$ZSH/themes/$ZSH_THEME.zsh-theme" + if [ ! "$ZSH_THEME" = "" ] + then + source "$ZSH/themes/$ZSH_THEME.zsh-theme" + fi fi - -# Check for updates on initial load... -if [ "$DISABLE_AUTO_UPDATE" = "true" ] -then - return -else - /usr/bin/env zsh $ZSH/tools/check_for_upgrade.sh -fi |