From ce89b5cf0b9bf96b802d9a7459ca669c69e64208 Mon Sep 17 00:00:00 2001 From: e2dk4r <43293320+e2dk4r@users.noreply.github.com> Date: Sat, 7 Dec 2024 16:27:01 +0300 Subject: [PATCH] custom-completions: scoop: improve code readablity (#989) Break getting scoop directories multiple lines to improve code readablity. --- custom-completions/scoop/scoop-completions.nu | 31 ++++++++++++++----- 1 file changed, 24 insertions(+), 7 deletions(-) diff --git a/custom-completions/scoop/scoop-completions.nu b/custom-completions/scoop/scoop-completions.nu index d87a61f..d9b172b 100644 --- a/custom-completions/scoop/scoop-completions.nu +++ b/custom-completions/scoop/scoop-completions.nu @@ -11,11 +11,19 @@ def scoopArches [] { # list of all installed apps def scoopInstalledApps [] { - let localAppDir = if ('SCOOP' in $env) { [$env.SCOOP, 'apps'] | path join } else { [$env.USERPROFILE, 'scoop', 'apps'] | path join } - let localApps = (ls $localAppDir | get name | path basename) + let localAppDir = if ('SCOOP' in $env) { + [$env.SCOOP, 'apps'] | path join + } else { + [$env.USERPROFILE, 'scoop', 'apps'] | path join + } + let localApps = (ls $localAppDir | get name | path basename) - let globalAppDir = if ('SCOOP_GLOBAL' in $env) { [$env.SCOOP_GLOBAL, 'apps'] | path join } else { [$env.ProgramData, 'scoop', 'apps'] | path join } - let globalApps = if ($globalAppDir | path exists) { ls $globalAppDir | get name | path basename } + let globalAppDir = if ('SCOOP_GLOBAL' in $env) { + [$env.SCOOP_GLOBAL, 'apps'] | path join + } else { + [$env.ProgramData, 'scoop', 'apps'] | path join + } + let globalApps = if ($globalAppDir | path exists) { ls $globalAppDir | get name | path basename } $localApps | append $globalApps } @@ -27,7 +35,11 @@ def scoopInstalledAppsWithStar [] { # list of all manifests from all buckets def scoopAllApps [] { - let bucketsDir = if ('SCOOP' in $env) { [ $env.SCOOP, 'buckets' ] | path join } else { [ $env.USERPROFILE, 'scoop', 'buckets' ] | path join } + let bucketsDir = if ('SCOOP' in $env) { + [ $env.SCOOP, 'buckets' ] | path join + } else { + [ $env.USERPROFILE, 'scoop', 'buckets' ] | path join + } (ls -s $bucketsDir | get name) | each {|bucket| ls ([$bucketsDir, $bucket, 'bucket', '*.json'] | path join ) | get name | path basename | str substring ..-5} | flatten | uniq } @@ -650,8 +662,13 @@ def scoopKnownBuckets [] { } def scoopInstalledBuckets [] { - let bucketsDir = if ('SCOOP' in (env).name) { [ (getenv 'SCOOP'), 'buckets' ] | path join } else { [ (getenv 'USERPROFILE'), 'scoop', 'buckets' ] | path join } - let buckets = (ls $bucketsDir | get name | path basename) + let bucketsDir = if ('SCOOP' in $env) { + [ $env.SCOOP, 'buckets' ] | path join + } else { + [ $env.USERPROFILE, 'scoop', 'buckets' ] | path join + } + + let buckets = (ls $bucketsDir | get name | path basename) $buckets }