From 9dadc822e354e98b75e51c836ff464cbc8d4676a Mon Sep 17 00:00:00 2001 From: romkatv Date: Sun, 29 Mar 2020 18:48:19 +0200 Subject: pull upstream changes from gitstatus --- gitstatus/bin/gitstatusd-android-aarch64 | Bin 1109320 -> 59 bytes gitstatus/bin/gitstatusd-cygwin_nt-10.0-i686 | Bin 0 -> 2271758 bytes gitstatus/bin/gitstatusd-cygwin_nt-10.0-x86_64 | Bin 2207744 -> 2105344 bytes gitstatus/bin/gitstatusd-cygwin_nt-6.1-x86_64 | 4 +++- gitstatus/bin/gitstatusd-cygwin_nt-6.3-x86_64 | 4 +++- gitstatus/bin/gitstatusd-freebsd-amd64 | Bin 3302024 -> 3375760 bytes gitstatus/bin/gitstatusd-freebsd-x86_64 | 1 - gitstatus/bin/gitstatusd-linux-aarch64 | Bin 2310928 -> 2101880 bytes gitstatus/bin/gitstatusd-linux-armv6l | 4 +++- gitstatus/bin/gitstatusd-linux-armv7l | Bin 1910300 -> 1247552 bytes gitstatus/bin/gitstatusd-linux-i386 | Bin 0 -> 2390692 bytes gitstatus/bin/gitstatusd-linux-i586 | 3 +++ gitstatus/bin/gitstatusd-linux-i686 | 3 +++ gitstatus/bin/gitstatusd-linux-x86_64-static | Bin 2102464 -> 36 bytes gitstatus/bin/gitstatusd-msys_nt-10.0-i686 | Bin 0 -> 2271246 bytes gitstatus/bin/gitstatusd-msys_nt-10.0-x86_64 | Bin 2032640 -> 2104832 bytes gitstatus/gitstatus.plugin.zsh | 13 +++++++------ 17 files changed, 22 insertions(+), 10 deletions(-) create mode 100755 gitstatus/bin/gitstatusd-cygwin_nt-10.0-i686 mode change 120000 => 100755 gitstatus/bin/gitstatusd-cygwin_nt-6.1-x86_64 mode change 120000 => 100755 gitstatus/bin/gitstatusd-cygwin_nt-6.3-x86_64 delete mode 120000 gitstatus/bin/gitstatusd-freebsd-x86_64 mode change 120000 => 100755 gitstatus/bin/gitstatusd-linux-armv6l create mode 100755 gitstatus/bin/gitstatusd-linux-i386 create mode 100755 gitstatus/bin/gitstatusd-linux-i586 create mode 100755 gitstatus/bin/gitstatusd-linux-i686 create mode 100755 gitstatus/bin/gitstatusd-msys_nt-10.0-i686 (limited to 'gitstatus') diff --git a/gitstatus/bin/gitstatusd-android-aarch64 b/gitstatus/bin/gitstatusd-android-aarch64 index 24ff2854..9d76b206 100755 Binary files a/gitstatus/bin/gitstatusd-android-aarch64 and b/gitstatus/bin/gitstatusd-android-aarch64 differ diff --git a/gitstatus/bin/gitstatusd-cygwin_nt-10.0-i686 b/gitstatus/bin/gitstatusd-cygwin_nt-10.0-i686 new file mode 100755 index 00000000..e8167cfd Binary files /dev/null and b/gitstatus/bin/gitstatusd-cygwin_nt-10.0-i686 differ diff --git a/gitstatus/bin/gitstatusd-cygwin_nt-10.0-x86_64 b/gitstatus/bin/gitstatusd-cygwin_nt-10.0-x86_64 index 81ad0c61..15d4adba 100755 Binary files a/gitstatus/bin/gitstatusd-cygwin_nt-10.0-x86_64 and b/gitstatus/bin/gitstatusd-cygwin_nt-10.0-x86_64 differ diff --git a/gitstatus/bin/gitstatusd-cygwin_nt-6.1-x86_64 b/gitstatus/bin/gitstatusd-cygwin_nt-6.1-x86_64 deleted file mode 120000 index c0d9fb61..00000000 --- a/gitstatus/bin/gitstatusd-cygwin_nt-6.1-x86_64 +++ /dev/null @@ -1 +0,0 @@ -gitstatusd-cygwin_nt-10.0-x86_64 \ No newline at end of file diff --git a/gitstatus/bin/gitstatusd-cygwin_nt-6.1-x86_64 b/gitstatus/bin/gitstatusd-cygwin_nt-6.1-x86_64 new file mode 100755 index 00000000..c031d54a --- /dev/null +++ b/gitstatus/bin/gitstatusd-cygwin_nt-6.1-x86_64 @@ -0,0 +1,3 @@ +#!/bin/sh + +exec "${0%-6.1-x86_64}-10.0-x86_64" "$@" diff --git a/gitstatus/bin/gitstatusd-cygwin_nt-6.3-x86_64 b/gitstatus/bin/gitstatusd-cygwin_nt-6.3-x86_64 deleted file mode 120000 index c0d9fb61..00000000 --- a/gitstatus/bin/gitstatusd-cygwin_nt-6.3-x86_64 +++ /dev/null @@ -1 +0,0 @@ -gitstatusd-cygwin_nt-10.0-x86_64 \ No newline at end of file diff --git a/gitstatus/bin/gitstatusd-cygwin_nt-6.3-x86_64 b/gitstatus/bin/gitstatusd-cygwin_nt-6.3-x86_64 new file mode 100755 index 00000000..a2388978 --- /dev/null +++ b/gitstatus/bin/gitstatusd-cygwin_nt-6.3-x86_64 @@ -0,0 +1,3 @@ +#!/bin/sh + +exec "${0%-6.3-x86_64}-10.0-x86_64" "$@" diff --git a/gitstatus/bin/gitstatusd-freebsd-amd64 b/gitstatus/bin/gitstatusd-freebsd-amd64 index b08e2df9..a0fc5ccb 100755 Binary files a/gitstatus/bin/gitstatusd-freebsd-amd64 and b/gitstatus/bin/gitstatusd-freebsd-amd64 differ diff --git a/gitstatus/bin/gitstatusd-freebsd-x86_64 b/gitstatus/bin/gitstatusd-freebsd-x86_64 deleted file mode 120000 index ce481223..00000000 --- a/gitstatus/bin/gitstatusd-freebsd-x86_64 +++ /dev/null @@ -1 +0,0 @@ -gitstatusd-freebsd-amd64 \ No newline at end of file diff --git a/gitstatus/bin/gitstatusd-linux-aarch64 b/gitstatus/bin/gitstatusd-linux-aarch64 index 417cf52a..69171444 100755 Binary files a/gitstatus/bin/gitstatusd-linux-aarch64 and b/gitstatus/bin/gitstatusd-linux-aarch64 differ diff --git a/gitstatus/bin/gitstatusd-linux-armv6l b/gitstatus/bin/gitstatusd-linux-armv6l deleted file mode 120000 index 1990676d..00000000 --- a/gitstatus/bin/gitstatusd-linux-armv6l +++ /dev/null @@ -1 +0,0 @@ -gitstatusd-linux-armv7l \ No newline at end of file diff --git a/gitstatus/bin/gitstatusd-linux-armv6l b/gitstatus/bin/gitstatusd-linux-armv6l new file mode 100755 index 00000000..b8afa5ef --- /dev/null +++ b/gitstatus/bin/gitstatusd-linux-armv6l @@ -0,0 +1,3 @@ +#!/bin/sh + +exec "${0%-armv6l}-armv7l" "$@" diff --git a/gitstatus/bin/gitstatusd-linux-armv7l b/gitstatus/bin/gitstatusd-linux-armv7l index 18800d0d..78f0eb19 100755 Binary files a/gitstatus/bin/gitstatusd-linux-armv7l and b/gitstatus/bin/gitstatusd-linux-armv7l differ diff --git a/gitstatus/bin/gitstatusd-linux-i386 b/gitstatus/bin/gitstatusd-linux-i386 new file mode 100755 index 00000000..f004b548 Binary files /dev/null and b/gitstatus/bin/gitstatusd-linux-i386 differ diff --git a/gitstatus/bin/gitstatusd-linux-i586 b/gitstatus/bin/gitstatusd-linux-i586 new file mode 100755 index 00000000..424e49b8 --- /dev/null +++ b/gitstatus/bin/gitstatusd-linux-i586 @@ -0,0 +1,3 @@ +#!/bin/sh + +exec "${0%-i586}-i386" "$@" diff --git a/gitstatus/bin/gitstatusd-linux-i686 b/gitstatus/bin/gitstatusd-linux-i686 new file mode 100755 index 00000000..ef084218 --- /dev/null +++ b/gitstatus/bin/gitstatusd-linux-i686 @@ -0,0 +1,3 @@ +#!/bin/sh + +exec "${0%-i686}-i386" "$@" diff --git a/gitstatus/bin/gitstatusd-linux-x86_64-static b/gitstatus/bin/gitstatusd-linux-x86_64-static index 96486656..6ca5097f 100755 Binary files a/gitstatus/bin/gitstatusd-linux-x86_64-static and b/gitstatus/bin/gitstatusd-linux-x86_64-static differ diff --git a/gitstatus/bin/gitstatusd-msys_nt-10.0-i686 b/gitstatus/bin/gitstatusd-msys_nt-10.0-i686 new file mode 100755 index 00000000..f2cf7942 Binary files /dev/null and b/gitstatus/bin/gitstatusd-msys_nt-10.0-i686 differ diff --git a/gitstatus/bin/gitstatusd-msys_nt-10.0-x86_64 b/gitstatus/bin/gitstatusd-msys_nt-10.0-x86_64 index 0241c83c..e58ec409 100755 Binary files a/gitstatus/bin/gitstatusd-msys_nt-10.0-x86_64 and b/gitstatus/bin/gitstatusd-msys_nt-10.0-x86_64 differ 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 -- cgit v1.2.3