From 54c98228342043612ea83eaaf13ac13659c26295 Mon Sep 17 00:00:00 2001 From: Roman Perepelitsa Date: Mon, 8 Jun 2020 09:41:59 +0200 Subject: [PATCH] Squashed 'gitstatus/' changes from 643091154..ec9c39499 ec9c39499 don't download gitstatusd if there is a bad version in usrbin git-subtree-dir: gitstatus git-subtree-split: ec9c39499a96ea8b181db15c76df5089959d3111 --- gitstatus.plugin.sh | 3 +++ gitstatus.plugin.zsh | 3 +++ 2 files changed, 6 insertions(+) diff --git a/gitstatus.plugin.sh b/gitstatus.plugin.sh index d44d8cd7..685e81a2 100644 --- a/gitstatus.plugin.sh +++ b/gitstatus.plugin.sh @@ -164,6 +164,9 @@ function gitstatus_start() { (( ! _gitstatus_bash_downloaded )) || return [[ "${GITSTATUS_AUTO_INSTALL:-1}" -ne 0 ]] || return + [[ "$_gitstatus_bash_daemon" == \ + "${GITSTATUS_CACHE_DIR:-${XDG_CACHE_HOME:-$HOME/.cache}/gitstatus}"/* ]] || return + set -- -f "$@" _gitstatus_bash_daemon= _gitstatus_bash_version= diff --git a/gitstatus.plugin.zsh b/gitstatus.plugin.zsh index b4690727..66d128c2 100644 --- a/gitstatus.plugin.zsh +++ b/gitstatus.plugin.zsh @@ -414,6 +414,9 @@ function _gitstatus_daemon"${1:-}"() { (( ! _gitstatus_zsh_downloaded )) || return [[ ${GITSTATUS_AUTO_INSTALL:-1} == (|-|+)<1-> ]] || return + [[ $_gitstatus_zsh_daemon == + ${GITSTATUS_CACHE_DIR:-${XDG_CACHE_HOME:-$HOME/.cache}/gitstatus}/* ]] || return + set -- -f "$@" _gitstatus_zsh_daemon= _gitstatus_zsh_version=