From 855c741b0b23c9cf937a0123ef7982a26e965037 Mon Sep 17 00:00:00 2001 From: Marcus Noble Date: Sat, 10 Sep 2022 19:44:22 +0100 Subject: [PATCH] Better handling of installed git Signed-off-by: Marcus Noble --- home/.dotfiles/aliases | 5 ++++- install.sh | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/home/.dotfiles/aliases b/home/.dotfiles/aliases index ace8264..e58fc7b 100644 --- a/home/.dotfiles/aliases +++ b/home/.dotfiles/aliases @@ -10,8 +10,11 @@ alias _find=`which find` alias _top=`which top` alias _ps="/bin/ps" alias _dig=`which dig` -alias _git=`which git` alias _readlink=`which readlink` +alias _git=`which git` +if command -v $(brew --prefix)/bin/git &>/dev/null; then + alias _git=$(brew --prefix)/bin/git +fi # Aliases alias cat='bat ' diff --git a/install.sh b/install.sh index f8b3a48..e465e2f 100644 --- a/install.sh +++ b/install.sh @@ -29,8 +29,8 @@ sudo chmod -R 755 /usr/local/share/zsh/site-functions # Install tools BREW_TOOLS=( - argocd bandwhich bat danielfoehrkn/switch/switch derailed/k9s/k9s dive doggo duf dust exa fd fzf - git-delta go helm htop jq kind krew + git argocd bandwhich bat danielfoehrkn/switch/switch derailed/k9s/k9s + dive doggo duf dust exa fd fzf git-delta go helm htop jq kind krew kubectl kubectx kustomize node procs progress ripgrep rs/tap/curlie rust starship tektoncd/tools/tektoncd-cli tldr tailscale yq hashicorp/tap/vault tabby vale lastpass-cli jless macchina tz vmware-tanzu/carvel/kapp viddy