diff options
| author | Adam Lindberg <eproxus@gmail.com> | 2011-06-07 15:31:26 +0200 |
|---|---|---|
| committer | Adam Lindberg <eproxus@gmail.com> | 2011-06-07 15:31:26 +0200 |
| commit | 86b8827d27a72471eed0e39f3681b4d533811082 (patch) | |
| tree | cdd5b236aa57f0402e147c11fcc1bc8d3b136fe0 /oh-my-zsh.sh | |
| parent | 70cb607b7bee04ceef74d6f7aa80589e009e4c78 (diff) | |
| parent | ed990f61ff66a5c409ef2d8a444820cecf098188 (diff) | |
| download | zsh-86b8827d27a72471eed0e39f3681b4d533811082.tar.gz zsh-86b8827d27a72471eed0e39f3681b4d533811082.tar.bz2 zsh-86b8827d27a72471eed0e39f3681b4d533811082.zip | |
Merge remote-tracking branch 'robbyrussell/master'
Diffstat (limited to 'oh-my-zsh.sh')
| -rw-r--r-- | oh-my-zsh.sh | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/oh-my-zsh.sh b/oh-my-zsh.sh index dbff1ced9..d72d90cf9 100644 --- a/oh-my-zsh.sh +++ b/oh-my-zsh.sh @@ -1,3 +1,9 @@ +# 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 @@ -28,7 +34,6 @@ 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) @@ -41,11 +46,3 @@ else source "$ZSH/themes/$ZSH_THEME.zsh-theme" 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 |