From faa1cca1547099dbedd4497337c013bf0330a12b Mon Sep 17 00:00:00 2001 From: dnkmmr <104856296+dnkmmr69420@users.noreply.github.com> Date: Wed, 12 Apr 2023 15:47:32 -0500 Subject: [PATCH 1/3] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 62ca614a..54a18424 100644 --- a/README.md +++ b/README.md @@ -32,6 +32,7 @@ Currently, these distributions have existing packages for HyFetch: * Nix: `nix-env -i hyfetch` (Thanks to [@YisuiDenghua](https://github.com/YisuiDenghua)) * Guix: `guix install hyfetch` (Thanks to [@WammKD](https://github.com/WammKD)) * Slackware `sbopkg -b hyfetch` Slackware [Slackbuild](https://slackbuilds.org/repository/15.0/desktop/hyfetch/?search=hyfetch) (Thanks to [@bittin](https://github.com/bittin) and Urchlay) +* Nix Profile `nix profile install nixpkgs#hyfetch` ### Method 3: Install the latest developmental version using git From cbe8906073ebcdf460dce18613b44e0ef3d02f08 Mon Sep 17 00:00:00 2001 From: Hykilpikonna Date: Thu, 13 Apr 2023 04:26:09 -0400 Subject: [PATCH 2/3] [F] Fix #82 winget stuck on agreement --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 100df52b..d283e67e 100755 --- a/neofetch +++ b/neofetch @@ -2077,7 +2077,7 @@ get_packages() { has choco && dir "$ProgramData"/chocolatey/lib/* # Count winget - has winget && tot winget list + has winget && tot winget list --accept-source-agreements ;; Haiku) From bac650c84a785611d99142d0011619a2c84a2982 Mon Sep 17 00:00:00 2001 From: realRurichan Date: Sat, 15 Apr 2023 01:00:46 +0800 Subject: [PATCH 3/3] [F] Fix encoding errors on Windows with certain languages. --- neofetch | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/neofetch b/neofetch index d283e67e..1d2ee34b 100755 --- a/neofetch +++ b/neofetch @@ -1257,10 +1257,16 @@ get_distro() { # - The `any` version (ie `on Windows 11 Pro Insider Preview`) if [[ $(< /proc/version) == *Microsoft* || $kernel_version == *Microsoft* ]]; then - windows_version_verbose=$(wmic.exe os get Caption) - windows_version_verbose=$(trim "${windows_version_verbose/Caption}") - windows_version_verbose=$(trim "${windows_version_verbose/Microsoft}") + windows_version_verbose=$(reg query "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion" -v ProductName | grep REG_) + windows_version_verbose=$(trim "${windows_version_verbose/ProductName}") + windows_version_verbose=$(trim "${windows_version_verbose/REG_SZ}")buildnumber=$(reg query "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion" -v CurrentBuildNumber | grep REG_) windows_version_verbose=$(trim "${windows_version_verbose/Windows}") + windows_buildnumber=$(reg query "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion" -v CurrentBuildNumber | grep REG_) + windows_buildnumber=${buildnumber/CurrentBuildNumber} + windows_buildnumber=${buildnumber/REG_SZ} + if [[ "$windows_version_verbose" == *"10"* ]] && (( windows_buildnumber >= 22000 )); then + windows_version_verbose=${windows_version_verbose/10/11} + fi windows_version_current=${windows_version_verbose//[^[:digit:]]/} @@ -1369,9 +1375,17 @@ get_distro() { ;; Windows) - distro=$(wmic os get Caption) - distro=${distro/Caption} - distro=${distro/Microsoft } + distro=$(reg query "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion" -v ProductName | grep REG_) + distro=${distro/ProductName} + distro=${distro/REG_SZ} + buildnumber=$(reg query "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion" -v CurrentBuildNumber | grep REG_) + buildnumber=${buildnumber/CurrentBuildNumber} + buildnumber=${buildnumber/REG_SZ} + + # If the value of "ProductName" obtained is Windows 10 and the value of "CurrentBuildNumber" is greater than 22000, then the actual operating system version is Windows 11. + if [[ "$distro" == *"Windows 10"* ]] && (( buildnumber >= 22000 )); then + distro=${distro/Windows 10/Windows 11} + fi ;; Solaris|illumos)