Merge remote-tracking branch 'upstream/master'

This commit is contained in:
hc 2015-11-04 16:20:52 +08:00
commit 240e08bacb
390 changed files with 23279 additions and 1968 deletions

View file

@ -1,15 +1,17 @@
#!/bin/sh
#!/usr/bin/env zsh
zmodload zsh/datetime
function _current_epoch() {
echo $(($(date +%s) / 60 / 60 / 24))
echo $(( $EPOCHSECONDS / 60 / 60 / 24 ))
}
function _update_zsh_update() {
echo "LAST_EPOCH=$(_current_epoch)" > ~/.zsh-update
echo "LAST_EPOCH=$(_current_epoch)" >! ~/.zsh-update
}
function _upgrade_zsh() {
/usr/bin/env ZSH=$ZSH /bin/sh $ZSH/tools/upgrade.sh
env ZSH=$ZSH /bin/sh $ZSH/tools/upgrade.sh
# update the zsh file
_update_zsh_update
}
@ -20,6 +22,13 @@ if [[ -z "$epoch_target" ]]; then
epoch_target=13
fi
# Cancel upgrade if the current user doesn't have write permissions for the
# oh-my-zsh directory.
[[ -w "$ZSH" ]] || return 0
# Cancel upgrade if git is unavailable on the system
whence git >/dev/null || return 0
if [ -f ~/.zsh-update ]
then
. ~/.zsh-update
@ -35,10 +44,9 @@ then
then
_upgrade_zsh
else
echo "[Oh My Zsh] Would you like to check for updates?"
echo "Type Y to update oh-my-zsh: \c"
echo "[Oh My Zsh] Would you like to check for updates? [Y/n]: \c"
read line
if [ "$line" = Y ] || [ "$line" = y ]; then
if [ "$line" = Y ] || [ "$line" = y ] || [ -z "$line" ]; then
_upgrade_zsh
else
_update_zsh_update
@ -49,4 +57,3 @@ else
# create the zsh file
_update_zsh_update
fi