From f64cabc780496636b3e4f5283ef8d77c23f18e92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Mon, 24 Jan 2022 17:38:32 +0100
Subject: [PATCH] fix(cli): make sure to run `zsh` command if an alias exists
 (#9737)

Fixes #9737
---
 lib/cli.zsh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/cli.zsh b/lib/cli.zsh
index 2f3f293da..edc10e722 100644
--- a/lib/cli.zsh
+++ b/lib/cli.zsh
@@ -289,7 +289,7 @@ multi == 1 && length(\$0) > 0 {
   }
 
   # Exit if the new .zshrc file has syntax errors
-  if ! zsh -n "$zdot/.zshrc"; then
+  if ! command zsh -n "$zdot/.zshrc"; then
     _omz::log error "broken syntax in '"${zdot/#$HOME/\~}/.zshrc"'. Rolling back changes..."
     command mv -f "$zdot/.zshrc" "$zdot/.zshrc.new"
     command mv -f "$zdot/.zshrc.bck" "$zdot/.zshrc"
@@ -365,7 +365,7 @@ multi == 1 && /^[^#]*\)/ {
   }
 
   # Exit if the new .zshrc file has syntax errors
-  if ! zsh -n "$zdot/.zshrc"; then
+  if ! command zsh -n "$zdot/.zshrc"; then
     _omz::log error "broken syntax in '"${zdot/#$HOME/\~}/.zshrc"'. Rolling back changes..."
     command mv -f "$zdot/.zshrc" "$zdot/.zshrc.new"
     command mv -f "$zdot/.zshrc.bck" "$zdot/.zshrc"
@@ -721,7 +721,7 @@ EOF
   }
 
   # Exit if the new .zshrc file has syntax errors
-  if ! zsh -n "$zdot/.zshrc"; then
+  if ! command zsh -n "$zdot/.zshrc"; then
     _omz::log error "broken syntax in '"${zdot/#$HOME/\~}/.zshrc"'. Rolling back changes..."
     command mv -f "$zdot/.zshrc" "$zdot/.zshrc.new"
     command mv -f "$zdot/.zshrc.bck" "$zdot/.zshrc"
@@ -765,9 +765,9 @@ function _omz::update {
 
   # Run update script
   if [[ "$1" != --unattended ]]; then
-    ZSH="$ZSH" zsh -f "$ZSH/tools/upgrade.sh" --interactive || return $?
+    ZSH="$ZSH" command zsh -f "$ZSH/tools/upgrade.sh" --interactive || return $?
   else
-    ZSH="$ZSH" zsh -f "$ZSH/tools/upgrade.sh" || return $?
+    ZSH="$ZSH" command zsh -f "$ZSH/tools/upgrade.sh" || return $?
   fi
 
   # Update last updated file