Tack-Support
/
powerlevel10k
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pull upstream changes from gitstatus

Browse Source
pull/186/head
romkatv 5 years ago
parent 36d2c588f1
commit b4a2de9478
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File

10
gitstatus/gitstatus.plugin.zsh
Unescape Escape View File

@ -385,16 +385,16 @@ function gitstatus_start() {
read -r -d $'\x1e' -u $resp_fd -t $timeout reply read -r -d $'\x1e' -u $resp_fd -t $timeout reply
[[ $reply == $'hello\x1f0' ]] [[ $reply == $'hello\x1f0' ]]
function _gitstatus_cleanup_${ZSH_SUBSHELL}_${daemon_pid}() { function _gitstatus_cleanup_$$_${ZSH_SUBSHELL}_${daemon_pid}() {
emulate -L zsh emulate -L zsh
setopt err_return no_unset setopt err_return no_unset
local fname=${(%):-%N} local fname=${(%):-%N}
local prefix=_gitstatus_cleanup_${ZSH_SUBSHELL}_ local prefix=_gitstatus_cleanup_$$_${ZSH_SUBSHELL}_
[[ $fname == ${prefix}* ]] || return 0 [[ $fname == ${prefix}* ]] || return 0
local -i daemon_pid=${fname#$prefix} local -i daemon_pid=${fname#$prefix}
kill -- -$daemon_pid &>/dev/null || true kill -- -$daemon_pid &>/dev/null || true
} }
add-zsh-hook zshexit _gitstatus_cleanup_${ZSH_SUBSHELL}_${daemon_pid} add-zsh-hook zshexit _gitstatus_cleanup_$$_${ZSH_SUBSHELL}_${daemon_pid}
[[ $stderr_fd == -1 ]] || { [[ $stderr_fd == -1 ]] || {
unsetopt xtrace unsetopt xtrace
@ -413,7 +413,7 @@ function gitstatus_start() {
unset -f gitstatus_start_impl unset -f gitstatus_start_impl
} || { } || {
unsetopt err_return unsetopt err_return
add-zsh-hook -d zshexit _gitstatus_cleanup_${ZSH_SUBSHELL}_${daemon_pid} add-zsh-hook -d zshexit _gitstatus_cleanup_$$_${ZSH_SUBSHELL}_${daemon_pid}
[[ $daemon_pid -gt 0 ]] && kill -- -$daemon_pid &>/dev/null [[ $daemon_pid -gt 0 ]] && kill -- -$daemon_pid &>/dev/null
[[ $stderr_fd -ge 0 ]] && { exec 2>&$stderr_fd {stderr_fd}>&- } [[ $stderr_fd -ge 0 ]] && { exec 2>&$stderr_fd {stderr_fd}>&- }
[[ $lock_fd -ge 0 ]] && zsystem flock -u $lock_fd [[ $lock_fd -ge 0 ]] && zsystem flock -u $lock_fd
@ -482,7 +482,7 @@ function gitstatus_stop() {
local lock_fd=${(P)lock_fd_var:-} local lock_fd=${(P)lock_fd_var:-}
local daemon_pid=${(P)daemon_pid_var:-} local daemon_pid=${(P)daemon_pid_var:-}
local cleanup_func=_gitstatus_cleanup_${ZSH_SUBSHELL}_${daemon_pid} local cleanup_func=_gitstatus_cleanup_$$_${ZSH_SUBSHELL}_${daemon_pid}
[[ -n $daemon_pid ]] && kill -- -$daemon_pid &>/dev/null [[ -n $daemon_pid ]] && kill -- -$daemon_pid &>/dev/null
[[ -n $req_fd ]] && exec {req_fd}>&- [[ -n $req_fd ]] && exec {req_fd}>&-

Write Preview
Loading…
Cancel
Save