pull upstream changes from gitstatus

pull/85/head
romkatv 6 years ago
parent 5a30f6a399
commit 18bca74d93

@ -278,8 +278,10 @@ function gitstatus_start() {
local os && os=$(uname -s) && [[ -n $os ]] local os && os=$(uname -s) && [[ -n $os ]]
[[ $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 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 ]] [[ -f $daemon ]]
lock_file=$(mktemp "${TMPDIR:-/tmp}"/gitstatus.$$.lock.XXXXXXXXXX) lock_file=$(mktemp "${TMPDIR:-/tmp}"/gitstatus.$$.lock.XXXXXXXXXX)

Loading…
Cancel
Save