Skip to content

Commit

Permalink
fix(updater): abort update if $ZSH is not a git repository
Browse files Browse the repository at this point in the history
Fixes #12298
  • Loading branch information
mcornella committed Apr 18, 2024
1 parent c262ffb commit 56cfcb4
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 5 deletions.
12 changes: 11 additions & 1 deletion lib/cli.zsh
Original file line number Diff line number Diff line change
Expand Up @@ -773,7 +773,17 @@ function _omz::theme::use {
}

function _omz::update {
local last_commit=$(builtin cd -q "$ZSH"; git rev-parse HEAD)
# Check if git command is available
(( $+commands[git] )) || {
_omz::log error "git is not installed. Aborting..."
return 1
}

local last_commit=$(builtin cd -q "$ZSH"; git rev-parse HEAD 2>/dev/null)
[[ $? -eq 0 ]] || {
_omz::log error "\`$ZSH\` is not a git directory. Aborting..."
return 1
}

# Run update script
zstyle -s ':omz:update' verbose verbose_mode || verbose_mode=default
Expand Down
10 changes: 6 additions & 4 deletions tools/check_for_upgrade.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,16 @@ 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.
# - 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.
# - git is unavailable on the system
# - $ZSH is not a git repository
if [[ "$update_mode" = disabled ]] \
|| [[ ! -w "$ZSH" || ! -O "$ZSH" ]] \
|| [[ ! -t 1 ]] \
|| ! command git --version 2>&1 >/dev/null; then
|| ! command git --version 2>&1 >/dev/null
|| (builtin cd -q "$ZSH"; ! command git rev-parse --is-inside-work-tree &>/dev/null); then
unset update_mode
return
fi
Expand Down

0 comments on commit 56cfcb4

Please sign in to comment.