pull upstream changes from gitstatus

6 years ago · 66b331c251
parent 02b86416ec
commit 66b331c251
1 changed files with 2 additions and 1 deletions
--- a/gitstatus/gitstatus.plugin.zsh
+++ b/gitstatus/gitstatus.plugin.zsh
@ -275,7 +275,8 @@ function gitstatus_start() {
      setopt xtrace
    }

-    local os && { [[ $(uname -o) == Android ]] && os=Android || os=$(uname -s) } && [[ -n $os ]]
+    local os && os=$(uname -s) && [[ -n $os ]]
+    [[ $os != Linux || $(uname -o) != Android ]] || os=Android
    local arch && arch=$(uname -m) && [[ -n $arch ]]

    local daemon=${GITSTATUS_DAEMON:-$dir/bin/gitstatusd-${os:l}-${arch:l}}