Skip to content
This repository

Upgrade before init #395

Merged
merged 1 commit into from almost 3 years ago

3 participants

Vincent Guerci Robby Russell Michael Komitee
Vincent Guerci

No reload needed unless oh-my-zsh.sh has been modified, which would be 95% of cases.

It could also be possible to make oh-my-zsh script just a minimal bootstrap script, calling two subscript upgrade then init (that would just be the current omz.sh except for upgrade), to ensure 100%.

I don't think the upgrade scripts relies on anything from omz that is not loaded yet doing this, but maybe I'm wrong?

Robby Russell
Owner

Great idea... much smoother for upgrades. :-)

Robby Russell robbyrussell merged commit e8bd400 into from June 04, 2011
Robby Russell robbyrussell closed this June 04, 2011
Michael Komitee mkomitee referenced this pull request from a commit June 04, 2011
Fix bug from Pull request #395
    #395 broke oh-my-zsh for users who disable check-for-updates
9b4a89f
Vincent Guerci

oops, my bad! thanks @mkomitee.

Michael Komitee

No worries.

Ilkka Laukkanen ilkka referenced this pull request from a commit June 08, 2011
Commit has since been removed from the repository and is no longer available.
Caio Romão caio referenced this pull request from a commit June 14, 2011
Commit has since been removed from the repository and is no longer available.
Deepak Jois deepakjois referenced this pull request from a commit June 17, 2011
Commit has since been removed from the repository and is no longer available.
Ben Nicholas bmnick referenced this pull request from a commit July 17, 2011
Commit has since been removed from the repository and is no longer available.
Eric Thomas et referenced this pull request from a commit July 17, 2011
Commit has since been removed from the repository and is no longer available.
Seba Gamboa sagmor referenced this pull request from a commit in sagmor/oh-my-zsh June 04, 2011
Fix bug from Pull request #395
    #395 broke oh-my-zsh for users who disable check-for-updates
86952f2
Heikki Rauhala hvrauhal referenced this pull request from a commit July 25, 2011
Commit has since been removed from the repository and is no longer available.
Martin Klepsch mklappstuhl referenced this pull request from a commit in mklappstuhl/oh-my-zsh June 04, 2011
Fix bug from Pull request #395
    #395 broke oh-my-zsh for users who disable check-for-updates
40f3e5b
Sorin Ionescu sorin-ionescu referenced this pull request from a commit in sorin-ionescu/prezto June 04, 2011
Fix bug from Pull request #395
    #395 broke oh-my-zsh for users who disable check-for-updates
c2648a7
Michele Campeotto micampe referenced this pull request from a commit August 04, 2012
Commit has since been removed from the repository and is no longer available.
Michele Campeotto micampe referenced this pull request from a commit August 04, 2012
Commit has since been removed from the repository and is no longer available.
Michele Campeotto micampe referenced this pull request from a commit August 04, 2012
Commit has since been removed from the repository and is no longer available.
Matt Dean trabianmatt referenced this pull request from a commit in trabianmatt/oh-my-zsh June 04, 2011
Fix bug from Pull request #395
    #395 broke oh-my-zsh for users who disable check-for-updates
000a1f9
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Showing 1 unique commit by 1 author.

Jun 04, 2011
Vincent Guerci [upgrade] before init (no reload needed unless oh-my-zsh.sh has been …
…modified)
7c94745
This page is out of date. Refresh to see the latest.
17  oh-my-zsh.sh
... ...
@@ -1,3 +1,11 @@
  1
+# Check for updates on initial load...
  2
+if [ "$DISABLE_AUTO_UPDATE" = "true" ]
  3
+then
  4
+  return
  5
+else
  6
+  /usr/bin/env zsh $ZSH/tools/check_for_upgrade.sh
  7
+fi
  8
+
1 9
 # Initializes Oh My Zsh
2 10
 
3 11
 # add a function path
@@ -28,7 +36,6 @@ done
28 36
 for config_file ($ZSH/custom/*.zsh) source $config_file
29 37
 
30 38
 # Load the theme
31  
-# Check for updates on initial load...
32 39
 if [ "$ZSH_THEME" = "random" ]
33 40
 then
34 41
   themes=($ZSH/themes/*zsh-theme)
@@ -41,11 +48,3 @@ else
41 48
   source "$ZSH/themes/$ZSH_THEME.zsh-theme"
42 49
 fi
43 50
 
44  
-
45  
-# Check for updates on initial load...
46  
-if [ "$DISABLE_AUTO_UPDATE" = "true" ]
47  
-then
48  
-  return
49  
-else
50  
-  /usr/bin/env zsh $ZSH/tools/check_for_upgrade.sh
51  
-fi
1  tools/upgrade.sh
@@ -8,6 +8,5 @@ echo "\033[0;32m"'/ /_/ / / / /  / / / / / / /_/ /    / /_(__  ) / / / '"\033[0m
8 8
 echo "\033[0;32m"'\____/_/ /_/  /_/ /_/ /_/\__, /    /___/____/_/ /_/  '"\033[0m"
9 9
 echo "\033[0;32m"'                        /____/                       '"\033[0m"
10 10
 echo "\033[0;34mHooray! Oh My Zsh has been updated and/or is at the current version.\033[0m"
11  
-echo "\033[0;34mAny new updates will be reflected when you start your next terminal session.\033[0m"
12 11
 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"
13 12
 cd $current_path
Commit_comment_tip

Tip: You can add notes to lines in a file. Hover to the left of a line to make a note

Something went wrong with that request. Please try again.