mirror of
				https://github.com/ohmyzsh/ohmyzsh.git
				synced 2024-05-11 05:55:17 +00:00 
			
		
		
		
	Merge pull request #395 from vguerci/upgrade-before-init
Upgrade before init
This commit is contained in:
		
							
								
								
									
										17
									
								
								oh-my-zsh.sh
									
									
									
									
									
								
							
							
						
						
									
										17
									
								
								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
 | 
					# Initializes Oh My Zsh
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# add a function path
 | 
					# add a function path
 | 
				
			||||||
@@ -28,7 +36,6 @@ done
 | 
				
			|||||||
for config_file ($ZSH/custom/*.zsh) source $config_file
 | 
					for config_file ($ZSH/custom/*.zsh) source $config_file
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# Load the theme
 | 
					# Load the theme
 | 
				
			||||||
# Check for updates on initial load...
 | 
					 | 
				
			||||||
if [ "$ZSH_THEME" = "random" ]
 | 
					if [ "$ZSH_THEME" = "random" ]
 | 
				
			||||||
then
 | 
					then
 | 
				
			||||||
  themes=($ZSH/themes/*zsh-theme)
 | 
					  themes=($ZSH/themes/*zsh-theme)
 | 
				
			||||||
@@ -41,11 +48,3 @@ else
 | 
				
			|||||||
  source "$ZSH/themes/$ZSH_THEME.zsh-theme"
 | 
					  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
 | 
					 | 
				
			||||||
 
 | 
				
			|||||||
@@ -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;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;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"
 | 
					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
 | 
					cd $current_path
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user