From 049f25922763f10c32661d4cb19d8af74ca225f3 Mon Sep 17 00:00:00 2001 From: OldWorldOrdr Date: Sat, 11 Feb 2023 19:15:34 -0500 Subject: [PATCH 1/3] this is no longer nessesary and also doesnt work anymore --- neofetch | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/neofetch b/neofetch index 5244fc42..0c23cbc7 100755 --- a/neofetch +++ b/neofetch @@ -2007,16 +2007,8 @@ get_packages() { ProgramData="${mount:-/cygdrive/c}/ProgramData" fi - # Scoop environment throws errors if `tot scoop list` is used - has scoop && { - sdir=$(cygpath "$SCOOP" 2>/dev/null) - sdir="${sdir:-$HOME/scoop}" - pkgs_h=1 dir "$sdir"/apps/* && ((packages-=1)) - manager=scoop-global - sdir=$(cygpath "$SCOOP_GLOBAL" 2>/dev/null) - sdir="${sdir:-$ProgramData/scoop}" - dir "$sdir"/apps/* - } + scooplist() { scoop list | sed '1,4d' } # scoop list adds a few extra lines to be fancy, an easy fix is to just remove the first 4 lines. I dont know a better way to do this. + has scoop && tot scooplist # Count chocolatey packages. # [[ -d /c/ProgramData/chocolatey/lib ]] && \ From 928dfd713c9497e7d03aae5b2d646aed502fcb5d Mon Sep 17 00:00:00 2001 From: OldWorldOrdr Date: Sat, 11 Feb 2023 19:22:50 -0500 Subject: [PATCH 2/3] fix --- neofetch | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 0c23cbc7..12ab5b0c 100755 --- a/neofetch +++ b/neofetch @@ -2007,7 +2007,8 @@ get_packages() { ProgramData="${mount:-/cygdrive/c}/ProgramData" fi - scooplist() { scoop list | sed '1,4d' } # scoop list adds a few extra lines to be fancy, an easy fix is to just remove the first 4 lines. I dont know a better way to do this. + # scoop list adds a few extra lines to be fancy, an easy fix is to just remove the first 4 lines. I dont know a better way to do this. + scooplist() { scoop list | sed '1,4d'; } has scoop && tot scooplist # Count chocolatey packages. From 3834122a3715a2e506d5ee218fae9947159451cb Mon Sep 17 00:00:00 2001 From: Hykilpikonna Date: Sat, 11 Feb 2023 23:14:29 -0500 Subject: [PATCH 3/3] [U] scoop: Use pkgs_h instead of custom sed --- neofetch | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/neofetch b/neofetch index 12ab5b0c..98efe00c 100755 --- a/neofetch +++ b/neofetch @@ -2008,8 +2008,7 @@ get_packages() { fi # scoop list adds a few extra lines to be fancy, an easy fix is to just remove the first 4 lines. I dont know a better way to do this. - scooplist() { scoop list | sed '1,4d'; } - has scoop && tot scooplist + has scoop && pkgs_h=4 tot scoop list # Count chocolatey packages. # [[ -d /c/ProgramData/chocolatey/lib ]] && \