From aab631c7dd701ae35a70632a9672c8e9b18fe656 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 6 Dec 2021 05:31:15 +0200 Subject: [PATCH 1/4] neofetch: Fix WSL windows version. Closes #1848 --- neofetch | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/neofetch b/neofetch index 9fef38fe..85ccb8db 100755 --- a/neofetch +++ b/neofetch @@ -1102,10 +1102,13 @@ get_distro() { fi if [[ $(< /proc/version) == *Microsoft* || $kernel_version == *Microsoft* ]]; then + windows_version=$(wmic os get Version) + windows_version=$(trim "${windows_version/Version}") + case $distro_shorthand in - on) distro+=" [Windows 10]" ;; - tiny) distro="Windows 10" ;; - *) distro+=" on Windows 10" ;; + on) distro+=" [Windows $windows_version]" ;; + tiny) distro="Windows ${windows_version::2}" ;; + *) distro+=" on Windows $windows_version" ;; esac elif [[ $(< /proc/version) == *chrome-bot* || -f /dev/cros_ec ]]; then From 7b1f0c275eba9d5681c647def3f8d845f43941a6 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 6 Dec 2021 06:36:44 +0200 Subject: [PATCH 2/4] neofetch: Fix windows detection --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 85ccb8db..9db82184 100755 --- a/neofetch +++ b/neofetch @@ -1102,7 +1102,7 @@ get_distro() { fi if [[ $(< /proc/version) == *Microsoft* || $kernel_version == *Microsoft* ]]; then - windows_version=$(wmic os get Version) + windows_version=$(wmic.exe os get Version) windows_version=$(trim "${windows_version/Version}") case $distro_shorthand in From 3eaac2d9eec198e63e4904d46c6704ad7f5a2d87 Mon Sep 17 00:00:00 2001 From: The TwilightBlood Date: Wed, 8 Dec 2021 02:11:14 -0600 Subject: [PATCH 3/4] Add pacstall to package managers (#1979) * Add pacstall to package managers https://github.com/pacstall/pacstall * Fix indents on Pacstall * Fix tabbing again --- neofetch | 1 + 1 file changed, 1 insertion(+) diff --git a/neofetch b/neofetch index 9db82184..e6adbade 100755 --- a/neofetch +++ b/neofetch @@ -1564,6 +1564,7 @@ get_packages() { has butch && tot butch list has swupd && tot swupd bundle-list --quiet has pisi && tot pisi li + has pacstall && tot pacstall -L # Using the dnf package cache is much faster than rpm. if has dnf && type -p sqlite3 >/dev/null && [[ -f /var/cache/dnf/packages.db ]]; then From 644f9d29eb9dd9f68b29f80f37fb4ad57236a67d Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 10 Dec 2021 08:41:28 +0200 Subject: [PATCH 4/4] neofetch: Fix #1989 --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 9db82184..90bf0966 100755 --- a/neofetch +++ b/neofetch @@ -11577,7 +11577,7 @@ main() { err "Neofetch command: $0 $*" err "Neofetch version: $version" - [[ $verbose == on ]] && printf %b "$err" >&2 + [[ $verbose == on ]] && printf '%b\033[m' "$err" >&2 # If `--loop` was used, constantly redraw the image. while [[ $image_loop == on && $image_backend == w3m ]]; do