pull upstream changes from gitstatus

This commit is contained in:
romkatv 2019-06-07 15:04:54 +02:00
parent 18bca74d93
commit 15f0284b12

View file

@ -279,7 +279,7 @@ function gitstatus_start() {
[[ $os != Linux || $(uname -o) != Android ]] || os=Android [[ $os != Linux || $(uname -o) != Android ]] || os=Android
local arch && arch=$(uname -m) && [[ -n $arch ]] local arch && arch=$(uname -m) && [[ -n $arch ]]
local ldd_v && (( $+commands[ldd] )) && ldd_v=$(command ldd --version 2>/dev/null) || true 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 linkage && [[ $os != Linux || ${(L)ldd_v} == (*glibc*|*gnu\ libc*) ]] || linkage=-static
local daemon=${GITSTATUS_DAEMON:-$dir/bin/gitstatusd-${os:l}-${arch:l}${linkage}} local daemon=${GITSTATUS_DAEMON:-$dir/bin/gitstatusd-${os:l}-${arch:l}${linkage}}
[[ -f $daemon ]] [[ -f $daemon ]]