Fix windows detection to match version

MrStanDu33 commented 1 year ago

Description

This PR fixes the wrong windows version displayed when host uses Windows 11.

⚠️ Only tested in WSL2 using Debian, not in Windows itself ⚠️

Thanks to @Kwaay for issuing this bug to me and helping me fixing it.

Reason

This bug was caused by neofetch using the command

wmic.exe os get Version

to get the OS version. But this prompt returns

Version
10.0.25330

even if I am using Windows 11. (my build version is 25330, so it is fine).

You can see a comparison here :

But if we use the command

wmic.exe os get Caption

to get the OS version, we get

Caption
Microsoft Windows 11 Pro Insider Preview

So using this we lose the build number, but we get the correct OS version.

Before (See OS section)

`distro_shorthand` value	result
`on`
`tiny`
`*`

After (See OS section)

`distro_shorthand` value	result
`on`
`tiny`
`*`

Features

Add Windows 11 support

Issues

None

TODO

[X] Test those changes in WSL2 using Windows 11.
[ ] Test those changes in WSL1 using Windows 11.
[ ] Test those changes in Windows 11 itself (not inside a WSL machine).
[x] Test those changes in WSL2 using Windows 10.
[ ] Test those changes in WSL1 using Windows 10.
[ ] Test those changes in Windows 10 itself (not inside a WSL machine).

Unfortunatly I cannot perform tests on other WSLs versions, nor in a Windows 10 machine, but I hope someone can ! 🤞

youquzhiji commented 1 year ago

Tested on Windows 10 WSL2

hykilpikonna commented 1 year ago

Thank you for your contribution!

This PR is merged into hyfetch since this repo (dylanaraps/neofetch) seems no longer maintained.

HyFetch is a fork of neofetch with LGBTQ pride flags, but the repo also maintains an updated version of the original neofetch, addressing many pull requests that are not merged in the original repo.

Read the "Running Updated Original Neofetch" section for more info!

dylanaraps / neofetch