diff options
| author | romkatv <roman.perepelitsa@gmail.com> | 2020-01-16 13:43:32 +0300 |
|---|---|---|
| committer | romkatv <roman.perepelitsa@gmail.com> | 2020-01-16 13:43:32 +0300 |
| commit | c21961b53c137253020aeffca2b132fdd6bcb116 (patch) | |
| tree | 45d6ce5f38fd559f8192fd1417e334e024eec45d | |
| parent | a0f3d94dd660aac92ecc36329bc8a3219c42f586 (diff) | |
pull upstream changes from gitstatusv1.0
| -rw-r--r-- | gitstatus/gitstatus.plugin.zsh | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/gitstatus/gitstatus.plugin.zsh b/gitstatus/gitstatus.plugin.zsh index 46d0b3cc..7c9073f1 100644 --- a/gitstatus/gitstatus.plugin.zsh +++ b/gitstatus/gitstatus.plugin.zsh @@ -371,7 +371,8 @@ function gitstatus_start() { } (( daemon_pid == -1 )) || { - local daemon=${GITSTATUS_DAEMON:-} os + local os + local daemon=${GITSTATUS_DAEMON:-} [[ -n $daemon ]] || { os="$(uname -s)" && [[ -n $os ]] [[ $os != Linux || "$(uname -o)" != Android ]] || os=Android @@ -428,7 +429,7 @@ function gitstatus_start() { # zsh -mc '' &! # hangs when using zsh 5.0.2 local zsh=${${:-/proc/self/exe}:A} [[ -x $zsh ]] || zsh=zsh - cmd="cd /; read; $setsid ${(q)zsh} -dfxc ${(q)cmd} &!; rm -f ${(q)req_fifo} ${(q)resp_fifo} ${(q)lock_file}" + cmd="cd /; read; unsetopt bg_nice; $setsid ${(q)zsh} -dfxc ${(q)cmd} &!; rm -f ${(q)req_fifo} ${(q)resp_fifo} ${(q)lock_file}" # We use `zsh -c` instead of plain {} or () to work around bugs in zplug (it hangs on # startup). Double fork is to daemonize, and so is `setsid`. Note that on macOS `setsid` has # to be installed manually by running `brew install util-linux`. |