diff options
| author | romkatv <roman.perepelitsa@gmail.com> | 2019-06-07 11:41:10 +0300 |
|---|---|---|
| committer | romkatv <roman.perepelitsa@gmail.com> | 2019-06-07 11:41:10 +0300 |
| commit | 18bca74d938c1bcec5ed2000ebf48598ce11963d (patch) | |
| tree | 2042e95d4af3ddd1055a3b2022722e7e84cd7b9a | |
| parent | 5a30f6a399e86a2922032f1466038ccbd884817e (diff) | |
pull upstream changes from gitstatus
| -rwxr-xr-x | gitstatus/bin/gitstatusd-linux-x86_64-static | bin | 0 -> 2020568 bytes | |||
| -rw-r--r-- | gitstatus/gitstatus.plugin.zsh | 4 |
2 files changed, 3 insertions, 1 deletions
diff --git a/gitstatus/bin/gitstatusd-linux-x86_64-static b/gitstatus/bin/gitstatusd-linux-x86_64-static Binary files differnew file mode 100755 index 00000000..d683cf0d --- /dev/null +++ b/gitstatus/bin/gitstatusd-linux-x86_64-static diff --git a/gitstatus/gitstatus.plugin.zsh b/gitstatus/gitstatus.plugin.zsh index ecb47db8..e6dcb5a0 100644 --- a/gitstatus/gitstatus.plugin.zsh +++ b/gitstatus/gitstatus.plugin.zsh @@ -278,8 +278,10 @@ function gitstatus_start() { local os && os=$(uname -s) && [[ -n $os ]] [[ $os != Linux || $(uname -o) != Android ]] || os=Android local arch && arch=$(uname -m) && [[ -n $arch ]] + local ldd_v && (( $+commands[ldd] )) && ldd_v=$(command ldd --version 2>/dev/null) || true + local linkage && [[ ${(L)ldd_v} == (*glibc*|*gnu\ libc*) ]] || linkage=-static - local daemon=${GITSTATUS_DAEMON:-$dir/bin/gitstatusd-${os:l}-${arch:l}} + local daemon=${GITSTATUS_DAEMON:-$dir/bin/gitstatusd-${os:l}-${arch:l}${linkage}} [[ -f $daemon ]] lock_file=$(mktemp "${TMPDIR:-/tmp}"/gitstatus.$$.lock.XXXXXXXXXX) |