diff options
| author | romkatv <roman.perepelitsa@gmail.com> | 2019-07-24 13:41:10 +0300 |
|---|---|---|
| committer | romkatv <roman.perepelitsa@gmail.com> | 2019-07-24 13:41:10 +0300 |
| commit | ca8a5bdeaa85314915d49124a68592e096af41d1 (patch) | |
| tree | af5c8a0e53f27d627f926a7735bd41af32a8f958 | |
| parent | 202f781e59ff49d8745f641fd8208e32b0a510e0 (diff) | |
| parent | bb2f9afafea1de38196c4b5181564b6e97925fba (diff) | |
Merge branch 'master' into dev
| -rw-r--r-- | gitstatus/gitstatus.plugin.zsh | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/gitstatus/gitstatus.plugin.zsh b/gitstatus/gitstatus.plugin.zsh index e5352038..07c36f54 100644 --- a/gitstatus/gitstatus.plugin.zsh +++ b/gitstatus/gitstatus.plugin.zsh @@ -347,22 +347,31 @@ function gitstatus_start() { --dirty-max-index-size=${(q)dirty_max_index_size} ${${log_level:#INFO}:+--log-level=$log_level}) - # We use `zsh -c` instead of plain {} or () to work around bugs in zplug. It hangs on startup. - zsh -dfxc " + local cmd=" + echo \$\$ ${(q)daemon} $daemon_args if [[ \$? != (0|10) && \$? -le 128 && -z ${(q)GITSTATUS_DAEMON:-} && -f ${(q)daemon}-static ]]; then ${(q)daemon}-static $daemon_args fi - echo -nE $'bye\x1f0\x1e' - " <$req_fifo >$resp_fifo 2>$log_file 3<$lock_file &! + echo -nE $'bye\x1f0\x1e'" + local setsid=${commands[setsid]:-/usr/local/opt/util-linux/bin/setsid} + [[ -f $setsid ]] && setsid=${(q)setsid} || setsid= + cmd="$setsid zsh -dfxc ${(q)cmd} &!" + # We use `zsh -c` instead of plain {} or () to work around bugs in zplug. It hangs on startup. + # Double fork is to daemonize. Some macOS users had issues when gitstatusd was a child process + # of the interactive zsh. For example, https://github.com/romkatv/powerlevel10k/issues/123 + # and https://github.com/romkatv/powerlevel10k/issues/97. If you are using macOS and seeing + # errors like `gitstatus_query:echo:32: write error: broken pipe`, install `setsid` utility + # by running `brew install util-linux`. + zsh -dfmxc $cmd <$req_fifo >$resp_fifo 2>$log_file 3<$lock_file &! - daemon_pid=$! - sysopen -w -o cloexec,sync -u req_fd $req_fifo sysopen -r -o cloexec -u resp_fd $resp_fifo + read -u $resp_fd daemon_pid + rm -f $req_fifo $resp_fifo $lock_file function _gitstatus_process_response_${name}() { |