diff options
| author | Tristan Carel <tcarel@exalead.com> | 2011-10-10 14:58:28 +0200 |
|---|---|---|
| committer | Tristan Carel <tcarel@exalead.com> | 2011-10-10 14:58:28 +0200 |
| commit | db90589c8a02e98e657af17bb0b460b752d9ed61 (patch) | |
| tree | d1354a9338bf9921ad0f66d2f5394272e1cfec77 /tools/check_for_upgrade.sh | |
| parent | 7066bf7c6b522af9147ebf03c00361c4c6490d42 (diff) | |
| parent | 57f04b921ea1c12a0a283331778848cd4011bf21 (diff) | |
| download | zsh-db90589c8a02e98e657af17bb0b460b752d9ed61.tar.gz zsh-db90589c8a02e98e657af17bb0b460b752d9ed61.tar.bz2 zsh-db90589c8a02e98e657af17bb0b460b752d9ed61.zip | |
Merge remote-tracking branch 'upstream/master' into emacs
Conflicts:
plugins/emacs/emacs.plugin.zsh
plugins/emacs/emacsclient.sh
Diffstat (limited to 'tools/check_for_upgrade.sh')
| -rw-r--r-- | tools/check_for_upgrade.sh | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/tools/check_for_upgrade.sh b/tools/check_for_upgrade.sh index 4643739ca..e1e4eb99f 100644 --- a/tools/check_for_upgrade.sh +++ b/tools/check_for_upgrade.sh @@ -25,10 +25,11 @@ then if [ "$line" = Y ] || [ "$line" = y ] then /bin/sh $ZSH/tools/upgrade.sh + # update the zsh file + _update_zsh_update fi fi +else + # create the zsh file + _update_zsh_update fi - -# update the zsh file -_update_zsh_update - |