XorA
/
bash-it
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

plugins: Rename SCM_GIT_GITSTATUS_PLUGIN_SH_LOC to SCM_GIT_GITSTATUS_DIR 

Also fix the destructor in case plugin did not load as expected
pull/1622/head
Noah Gorny 2020-06-21 14:10:14 +03:00
parent 3eac73f613
commit d7aebe17a3
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
plugins/available/gitstatus.plugin.bash
View File

@ -7,16 +7,16 @@ function gitstatus_on_disable() {
group 'gitstatus' group 'gitstatus'
unset SCM_GIT_USE_GITSTATUS unset SCM_GIT_USE_GITSTATUS
gitstatus_stop _command_exists gitstatus_stop && gitstatus_stop
} }
[[ "$SCM_CHECK" == "true" ]] || return # No scm-check [[ "$SCM_CHECK" == "true" ]] || return # No scm-check
[[ $- == *i* ]] || return # non-interactive shell [[ $- == *i* ]] || return # non-interactive shell
SCM_GIT_GITSTATUS_PLUGIN_SH_LOC=${SCM_GIT_GITSTATUS_PLUGIN_SH_LOC:="$HOME/gitstatus/gitstatus.plugin.sh"} : ${SCM_GIT_GITSTATUS_DIR:="$HOME/gitstatus"}
if [[ -f "${SCM_GIT_GITSTATUS_PLUGIN_SH_LOC}" ]]; then if [[ -d "${SCM_GIT_GITSTATUS_DIR}" ]]; then
source "${SCM_GIT_GITSTATUS_PLUGIN_SH_LOC}" source "${SCM_GIT_GITSTATUS_DIR}/gitstatus.plugin.sh"
# Start the actual gitstatus binary # Start the actual gitstatus binary
gitstatus_stop && gitstatus_start -s -1 -u -1 -c -1 -d -1 gitstatus_stop && gitstatus_start -s -1 -u -1 -c -1 -d -1
export SCM_GIT_USE_GITSTATUS=true export SCM_GIT_USE_GITSTATUS=true

4
template/bash_profile.template.bash
View File

@ -32,8 +32,8 @@ export TODO="t"
# Set this to false to turn off version control status checking within the prompt for all themes # Set this to false to turn off version control status checking within the prompt for all themes
export SCM_CHECK=true export SCM_CHECK=true
# Set to actual location of gitstatus.plugin.sh if installed # Set to actual location of gitstatus directory if installed
#export SCM_GIT_GITSTATUS_PLUGIN_SH_LOC="$HOME/gitstatus/gitstatus.plugin.sh" #export SCM_GIT_GITSTATUS_DIR="$HOME/gitstatus"
# per default gitstatus uses 2 times as many threads as CPU cores, you can change this here if you must # per default gitstatus uses 2 times as many threads as CPU cores, you can change this here if you must
#export GITSTATUS_NUM_THREADS=8 #export GITSTATUS_NUM_THREADS=8