From 66b331c251140a80e0938b3e9e992bf2734256c5 Mon Sep 17 00:00:00 2001
From: romkatv <roman.perepelitsa@gmail.com>
Date: Thu, 6 Jun 2019 12:12:18 +0200
Subject: [PATCH] pull upstream changes from gitstatus

---
 gitstatus/gitstatus.plugin.zsh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gitstatus/gitstatus.plugin.zsh b/gitstatus/gitstatus.plugin.zsh
index 4809cb7a..ecb47db8 100644
--- 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}}