linux/ohmyzsh
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2026-02-20 03:02:29 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'upstream/master'

Browse source 
Conflicts:
	plugins/common-aliases/common-aliases.plugin.zsh
	templates/zshrc.zsh-template
This commit is contained in:
Aaron Biggs 2014-07-29 14:49:44 -05:00
commit b28391cf7f
53 changed files with 503 additions and 91 deletions
Download patch file Download diff file Expand all files Collapse all files

6
tools/check_for_upgrade.sh
View file

@ -5,7 +5,7 @@ function _current_epoch() {
}
function _update_zsh_update() {
echo "LAST_EPOCH=$(_current_epoch)" > ~/.zsh-update
echo "LAST_EPOCH=$(_current_epoch)" >! ~/.zsh-update
}
function _upgrade_zsh() {
@ -22,6 +22,10 @@ fi
[ -f ~/.profile ] && source ~/.profile
# Cancel upgrade if the current user doesn't have write permissions for the
# oh-my-zsh directory.
[[ -w "$ZSH" ]] || return 0
if [ -f ~/.zsh-update ]
then
. ~/.zsh-update