merge from upstream

This commit is contained in:
abc 2023-04-07 16:01:57 +08:00
commit 64603fdc86
229 changed files with 5826 additions and 2389 deletions

View file

@ -21,10 +21,12 @@ zstyle -s ':omz:update' mode update_mode || {
# Cancel update if:
# - the automatic update is disabled.
# - the current user doesn't have write permissions nor owns the $ZSH directory.
# - is not run from a tty
# - git is unavailable on the system.
if [[ "$update_mode" = disabled ]] \
|| [[ ! -w "$ZSH" || ! -O "$ZSH" ]] \
|| ! command -v git &>/dev/null; then
|| [[ ! -t 1 ]] \
|| ! command git --version 2>&1 >/dev/null; then
unset update_mode
return
fi
@ -65,7 +67,7 @@ function is_update_available() {
local remote_head
remote_head=$(
if (( ${+commands[curl]} )); then
curl -m 2 -fsSL -H 'Accept: application/vnd.github.v3.sha' $api_url 2>/dev/null
curl --connect-timeout 2 -fsSL -H 'Accept: application/vnd.github.v3.sha' $api_url 2>/dev/null
elif (( ${+commands[wget]} )); then
wget -T 2 -O- --header='Accept: application/vnd.github.v3.sha' $api_url 2>/dev/null
elif (( ${+commands[fetch]} )); then
@ -93,7 +95,8 @@ function update_last_updated_file() {
}
function update_ohmyzsh() {
if ZSH="$ZSH" zsh -f "$ZSH/tools/upgrade.sh" --interactive; then
zstyle -s ':omz:update' verbose verbose_mode || verbose_mode=default
if ZSH="$ZSH" zsh -f "$ZSH/tools/upgrade.sh" -i -v $verbose_mode; then
update_last_updated_file
fi
}