mingzailao
/
powerlevel10k
mirror of https://github.com/romkatv/powerlevel10k.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

pull upstream changes from gitstatus

pull/436/head v1.0
romkatv 2020-01-16 11:43:32 +01:00
parent a0f3d94dd6
commit c21961b53c
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gitstatus/gitstatus.plugin.zsh
View File

@ -371,7 +371,8 @@ function gitstatus_start() {
} }
(( daemon_pid == -1 )) || { (( daemon_pid == -1 )) || {
local daemon=${GITSTATUS_DAEMON:-} os local os
local daemon=${GITSTATUS_DAEMON:-}
[[ -n $daemon ]] || { [[ -n $daemon ]] || {
os="$(uname -s)" && [[ -n $os ]] os="$(uname -s)" && [[ -n $os ]]
[[ $os != Linux || "$(uname -o)" != Android ]] || os=Android [[ $os != Linux || "$(uname -o)" != Android ]] || os=Android
@ -428,7 +429,7 @@ function gitstatus_start() {
# zsh -mc '' &! # hangs when using zsh 5.0.2 # zsh -mc '' &! # hangs when using zsh 5.0.2
local zsh=${${:-/proc/self/exe}:A} local zsh=${${:-/proc/self/exe}:A}
[[ -x $zsh ]] || zsh=zsh [[ -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 # 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 # 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`. # to be installed manually by running `brew install util-linux`.