Skip to content

Commit ce89b5c

Browse files
authored
custom-completions: scoop: improve code readablity (#989)
Break getting scoop directories multiple lines to improve code readablity.
1 parent 6bd54bf commit ce89b5c

File tree

1 file changed

+24
-7
lines changed

1 file changed

+24
-7
lines changed

custom-completions/scoop/scoop-completions.nu

Lines changed: 24 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,19 @@ def scoopArches [] {
1111

1212
# list of all installed apps
1313
def scoopInstalledApps [] {
14-
let localAppDir = if ('SCOOP' in $env) { [$env.SCOOP, 'apps'] | path join } else { [$env.USERPROFILE, 'scoop', 'apps'] | path join }
15-
let localApps = (ls $localAppDir | get name | path basename)
14+
let localAppDir = if ('SCOOP' in $env) {
15+
[$env.SCOOP, 'apps'] | path join
16+
} else {
17+
[$env.USERPROFILE, 'scoop', 'apps'] | path join
18+
}
19+
let localApps = (ls $localAppDir | get name | path basename)
1620

17-
let globalAppDir = if ('SCOOP_GLOBAL' in $env) { [$env.SCOOP_GLOBAL, 'apps'] | path join } else { [$env.ProgramData, 'scoop', 'apps'] | path join }
18-
let globalApps = if ($globalAppDir | path exists) { ls $globalAppDir | get name | path basename }
21+
let globalAppDir = if ('SCOOP_GLOBAL' in $env) {
22+
[$env.SCOOP_GLOBAL, 'apps'] | path join
23+
} else {
24+
[$env.ProgramData, 'scoop', 'apps'] | path join
25+
}
26+
let globalApps = if ($globalAppDir | path exists) { ls $globalAppDir | get name | path basename }
1927

2028
$localApps | append $globalApps
2129
}
@@ -27,7 +35,11 @@ def scoopInstalledAppsWithStar [] {
2735

2836
# list of all manifests from all buckets
2937
def scoopAllApps [] {
30-
let bucketsDir = if ('SCOOP' in $env) { [ $env.SCOOP, 'buckets' ] | path join } else { [ $env.USERPROFILE, 'scoop', 'buckets' ] | path join }
38+
let bucketsDir = if ('SCOOP' in $env) {
39+
[ $env.SCOOP, 'buckets' ] | path join
40+
} else {
41+
[ $env.USERPROFILE, 'scoop', 'buckets' ] | path join
42+
}
3143
(ls -s $bucketsDir | get name) | each {|bucket| ls ([$bucketsDir, $bucket, 'bucket', '*.json'] | path join ) | get name | path basename | str substring ..-5} | flatten | uniq
3244
}
3345

@@ -650,8 +662,13 @@ def scoopKnownBuckets [] {
650662
}
651663

652664
def scoopInstalledBuckets [] {
653-
let bucketsDir = if ('SCOOP' in (env).name) { [ (getenv 'SCOOP'), 'buckets' ] | path join } else { [ (getenv 'USERPROFILE'), 'scoop', 'buckets' ] | path join }
654-
let buckets = (ls $bucketsDir | get name | path basename)
665+
let bucketsDir = if ('SCOOP' in $env) {
666+
[ $env.SCOOP, 'buckets' ] | path join
667+
} else {
668+
[ $env.USERPROFILE, 'scoop', 'buckets' ] | path join
669+
}
670+
671+
let buckets = (ls $bucketsDir | get name | path basename)
655672
$buckets
656673
}
657674

0 commit comments

Comments
 (0)