diff options
| author | vguerci <vguerci@gmail.com> | 2011-06-04 11:02:25 +0200 |
|---|---|---|
| committer | vguerci <vguerci@gmail.com> | 2011-06-04 11:52:13 +0200 |
| commit | 7c9474508cade14102a2fe1c63ad845fda521bec (patch) | |
| tree | 9c313b79bd5ea366b0c54082e7849a27582709b1 | |
| parent | 0c41b1cdc3ff7b00ffb2310b91becb91b31704f7 (diff) | |
| download | zsh-7c9474508cade14102a2fe1c63ad845fda521bec.tar.gz zsh-7c9474508cade14102a2fe1c63ad845fda521bec.tar.bz2 zsh-7c9474508cade14102a2fe1c63ad845fda521bec.zip | |
[upgrade] before init (no reload needed unless oh-my-zsh.sh has been modified)
| -rw-r--r-- | oh-my-zsh.sh | 17 | ||||
| -rw-r--r-- | tools/upgrade.sh | 1 |
2 files changed, 8 insertions, 10 deletions
diff --git a/oh-my-zsh.sh b/oh-my-zsh.sh index dbff1ced9..2157c38a0 100644 --- a/oh-my-zsh.sh +++ b/oh-my-zsh.sh @@ -1,3 +1,11 @@ +# 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 + # Initializes Oh My Zsh # add a function path @@ -28,7 +36,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 +48,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 diff --git a/tools/upgrade.sh b/tools/upgrade.sh index 7e5cc7655..e30488822 100644 --- a/tools/upgrade.sh +++ b/tools/upgrade.sh @@ -8,6 +8,5 @@ echo "\033[0;32m"'/ /_/ / / / / / / / / / / /_/ / / /_(__ ) / / / '"\033[0m echo "\033[0;32m"'\____/_/ /_/ /_/ /_/ /_/\__, / /___/____/_/ /_/ '"\033[0m" echo "\033[0;32m"' /____/ '"\033[0m" echo "\033[0;34mHooray! Oh My Zsh has been updated and/or is at the current version.\033[0m" -echo "\033[0;34mAny new updates will be reflected when you start your next terminal session.\033[0m" echo "\033[0;34mTo keep up on the latest, be sure to follow Oh My Zsh on twitter: \033[1mhttp://twitter.com/ohmyzsh\033[0m" cd $current_path |