diff options
| author | romkatv <roman.perepelitsa@gmail.com> | 2020-03-29 19:48:19 +0300 |
|---|---|---|
| committer | romkatv <roman.perepelitsa@gmail.com> | 2020-03-29 19:48:19 +0300 |
| commit | 9dadc822e354e98b75e51c836ff464cbc8d4676a (patch) | |
| tree | 8edf5ed3d3d74561bf53b74a603e6822377eab5e /gitstatus/gitstatus.plugin.zsh | |
| parent | 8573855d3966bb878eb853d3747b4384e19f7889 (diff) | |
pull upstream changes from gitstatus
Diffstat (limited to 'gitstatus/gitstatus.plugin.zsh')
| -rw-r--r-- | gitstatus/gitstatus.plugin.zsh | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/gitstatus/gitstatus.plugin.zsh b/gitstatus/gitstatus.plugin.zsh index 7a0034f8..12d1f167 100644 --- a/gitstatus/gitstatus.plugin.zsh +++ b/gitstatus/gitstatus.plugin.zsh @@ -503,15 +503,16 @@ function gitstatus_start() { elif [[ -n $GITSTATUS_DAEMON ]]; then local daemons=($_gitstatus_plugin_dir/{usrbin,bin}/$GITSTATUS_DAEMON) else - local -aU os + local -aU os=($kernel) case $kernel in linux) - os=("${(L)$(uname -o 2>/dev/null)}") || os=() - [[ $os[1] == android ]] || os=(linux) + local os_flavor + os_flavor="${(L)$(uname -o 2>/dev/null)}" && os+=(${(M)os_flavor:#android}) ;; - cygwin_nt-*) os=($kernel cygwin_nt-10.0);; - mingw*|msys*) os=($kernel msys_nt-10.0);; - *) os=($kernel);; + cygwin_nt-*) os+=(cygwin_nt-10.0);; + msys_nt-*) os+=(msys_nt-10.0);; + mingw32_nt-*) os+=(msys_nt-10.0);; + mingw64_nt-*) os+=(msys_nt-10.0);; esac local arch arch="${(L)$(uname -m)}" || return |