From 6294797986d86393b0c80c7c6d246713a978b550 Mon Sep 17 00:00:00 2001 From: Noah Gorny Date: Sat, 20 Jun 2020 15:15:55 +0300 Subject: [PATCH] Rename SCM_GIT_GITSTATUSD_LOC to SCM_GIT_GITSTATUSD_PLUGIN_SH_LOC --- plugins/available/gitstatusd.plugin.bash | 6 +++--- template/bash_profile.template.bash | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/plugins/available/gitstatusd.plugin.bash b/plugins/available/gitstatusd.plugin.bash index 0658fb1a..3551c6f9 100644 --- a/plugins/available/gitstatusd.plugin.bash +++ b/plugins/available/gitstatusd.plugin.bash @@ -14,9 +14,9 @@ function gitstatusd_on_disable() { [[ $- == *i* ]] || return # non-interactive shell -SCM_GIT_GITSTATUSD_LOC=${SCM_GIT_GITSTATUSD_LOC:="$HOME/gitstatus/gitstatus.plugin.sh"} -if [[ -f "${SCM_GIT_GITSTATUSD_LOC}" ]]; then - source "${SCM_GIT_GITSTATUSD_LOC}" +SCM_GIT_GITSTATUSD_PLUGIN_SH_LOC=${SCM_GIT_GITSTATUSD_PLUGIN_SH_LOC:="$HOME/gitstatus/gitstatus.plugin.sh"} +if [[ -f "${SCM_GIT_GITSTATUSD_PLUGIN_SH_LOC}" ]]; then + source "${SCM_GIT_GITSTATUSD_PLUGIN_SH_LOC}" # Start the actual gitstatusd binary gitstatus_stop && gitstatus_start -s -1 -u -1 -c -1 -d -1 export SCM_GIT_USE_GITSTATUSD=true diff --git a/template/bash_profile.template.bash b/template/bash_profile.template.bash index efafa8d9..6fa8e516 100755 --- a/template/bash_profile.template.bash +++ b/template/bash_profile.template.bash @@ -32,8 +32,8 @@ export TODO="t" # Set this to false to turn off version control status checking within the prompt for all themes export SCM_CHECK=true -# Set to actual location of gitstatusd if installed -#export SCM_GIT_GITSTATUSD_LOC="$HOME/gitstatus/gitstatus.plugin.sh" +# Set to actual location of gitstatusd.plugin.sh if installed +#export SCM_GIT_GITSTATUSD_PLUGIN_SH_LOC="$HOME/gitstatus/gitstatus.plugin.sh" # per default gitstatusd uses 2 times as many threads as CPU cores, you can change this here if you must #export GITSTATUS_NUM_THREADS=8