dolysis
/
ohmyzsh
3
0
Fork 0
Code Issues Pull Requests Releases Activity

fix(updater): stop update if connection unavailable

This commit is contained in:
Marc Cornellà 2021-11-05 19:47:29 +01:00
parent 0520c2e309
commit 7a2cb10625
No known key found for this signature in database
GPG Key ID: 0314585E776A9C1B
1 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
tools/check_for_upgrade.sh
View File

@ -54,14 +54,27 @@ function is_update_available() {
[[ "$repo" = ohmyzsh/ohmyzsh ]] || return 0 [[ "$repo" = ohmyzsh/ohmyzsh ]] || return 0
local api_url="https://api.github.com/repos/${repo}/commits/${branch}" local api_url="https://api.github.com/repos/${repo}/commits/${branch}"
# Get local and remote HEADs and compare them. If we can't get either assume there are updates # Get local HEAD. If this fails assume there are updates
local local_head remote_head local local_head
local_head=$(git -C "$ZSH" rev-parse $branch 2>/dev/null) || return 0 local_head=$(git -C "$ZSH" rev-parse $branch 2>/dev/null) || return 0
remote_head=$(curl -fsSL -H 'Accept: application/vnd.github.v3.sha' $api_url 2>/dev/null) \ # Get remote HEAD. If we can't get it assume there are updates unless there is no connection:
|| remote_head=$(wget -O- --header='Accept: application/vnd.github.v3.sha' $api_url 2>/dev/null) \ # - curl: 6 (could not resolve) or 7 (could not connect)
|| remote_head=$(HTTP_ACCEPT='Accept: application/vnd.github.v3.sha' fetch -o - $api_url 2>/dev/null) \ # - wget: 4 (network unreachable)
|| return 0 # - fetch: 1 (no route to host)
local remote_head ret
remote_head=$(
curl -fsSL -H 'Accept: application/vnd.github.v3.sha' $api_url 2>/dev/null || {
[[ $? -eq 6 || $? -eq 7 ]] && exit 1
} || wget -O- --header='Accept: application/vnd.github.v3.sha' $api_url 2>/dev/null || {
[[ $? -eq 4 ]] && exit 1
} || HTTP_ACCEPT='Accept: application/vnd.github.v3.sha' fetch -o - $api_url 2>/dev/null || {
[[ $? -eq 1 ]] && exit 1
} || exit 0
)
# If can't fetch remote HEAD, return exit code
ret=$?; [[ -n "$remote_head" ]] || return $ret
# Compare local and remote HEADs # Compare local and remote HEADs
[[ "$local_head" != "$remote_head" ]] [[ "$local_head" != "$remote_head" ]]