Simplify Scoop function

rashil2000 · rashil2000 · commit f19207d4f7c2 · 2022-02-16T23:51:34.000+05:30
diff --git a/winfetch.ps1 b/winfetch.ps1
@@ -841,14 +841,9 @@ function info_pkgs {
     }
 
     if ("scoop" -in $ShowPkgs) {
-        if (Test-Path "~/scoop/apps") {
-            $scoopdir = "~/scoop/apps"
-        } elseif (Get-Command -Name scoop -ErrorAction Ignore) {
-            $scoop = & scoop which scoop.ps1
-            $scoopdir = (Resolve-Path "$(Split-Path -Path $scoop)\..\..\..").Path
-        }
+        $scoopdir = if ($Env:SCOOP) { "$Env:SCOOP\apps" } else { "$Env:UserProfile\scoop\apps" }
 
-        if ($scoopdir) {
+        if (Test-Path $scoopdir) {
             $scooppkg = (Get-ChildItem -Path $scoopdir -Directory).Count - 1
         }
 

Original file line number	Diff line number	Diff line change
`@@ -841,14 +841,9 @@ function info_pkgs {`
`841`	`841`	`}`
`842`	`842`
`843`	`843`	`if ("scoop" -in $ShowPkgs) {`
`844`		`- if (Test-Path "~/scoop/apps") {`
`845`		`- $scoopdir = "~/scoop/apps"`
`846`		`- } elseif (Get-Command -Name scoop -ErrorAction Ignore) {`
`847`		`- $scoop = & scoop which scoop.ps1`
`848`		`- $scoopdir = (Resolve-Path "$(Split-Path -Path $scoop)\..\..\..").Path`
`849`		`- }`
	`844`	`+ $scoopdir = if ($Env:SCOOP) { "$Env:SCOOP\apps" } else { "$Env:UserProfile\scoop\apps" }`
`850`	`845`
`851`		`- if ($scoopdir) {`
	`846`	`+ if (Test-Path $scoopdir) {`
`852`	`847`	`$scooppkg = (Get-ChildItem -Path $scoopdir -Directory).Count - 1`
`853`	`848`	`}`
`854`	`849`