haskal
/
starship
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix(bash): Fix background jobs with z/autojump (#1897) 

Fixes issue where having z.sh or autojump hooked in bash
would cause spurious background job indicators to appear.
This commit is contained in:
Harald Hoyer 2020-12-02 07:29:02 +01:00 committed by GitHub
parent cf8a6d0738
commit f873a9820e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/init/starship.bash
View File

@ -28,9 +28,12 @@ starship_preexec() {
# Will be run before the prompt is drawn # Will be run before the prompt is drawn
starship_precmd() { starship_precmd() {
local NUM_JOBS
# Save the status, because commands in this pipeline will change $? # Save the status, because commands in this pipeline will change $?
STATUS=$? STATUS=$?
NUM_JOBS=$(n=0; while read line; do [[ $line ]] && n=$((n+1));done <<< $(jobs -p) ; echo $n)
# Run the bash precmd function, if it's set. If not set, evaluates to no-op # Run the bash precmd function, if it's set. If not set, evaluates to no-op
"${starship_precmd_user_func-:}" "${starship_precmd_user_func-:}"
@ -40,10 +43,10 @@ starship_precmd() {
if [[ $STARSHIP_START_TIME ]]; then if [[ $STARSHIP_START_TIME ]]; then
STARSHIP_END_TIME=$(::STARSHIP:: time) STARSHIP_END_TIME=$(::STARSHIP:: time)
STARSHIP_DURATION=$((STARSHIP_END_TIME - STARSHIP_START_TIME)) STARSHIP_DURATION=$((STARSHIP_END_TIME - STARSHIP_START_TIME))
PS1="$(::STARSHIP:: prompt --status=$STATUS --jobs="$(jobs -p | wc -l)" --cmd-duration=$STARSHIP_DURATION)" PS1="$(::STARSHIP:: prompt --status=$STATUS --jobs="$NUM_JOBS" --cmd-duration=$STARSHIP_DURATION)"
unset STARSHIP_START_TIME unset STARSHIP_START_TIME
else else
PS1="$(::STARSHIP:: prompt --status=$STATUS --jobs="$(jobs -p | wc -l)")" PS1="$(::STARSHIP:: prompt --status=$STATUS --jobs="$NUM_JOBS")"
fi fi
PREEXEC_READY=true # Signal that we can safely restart the timer PREEXEC_READY=true # Signal that we can safely restart the timer
} }