lint

Ash258 · May 15, 2020 · 444d1de · 444d1de
1 parent 692ff82
commit 444d1de
Show file tree

Hide file tree

Showing 37 changed files with 495 additions and 518 deletions.
diff --git a/.vscode/Cosi.code-workspace b/.vscode/Cosi.code-workspace
@@ -15,15 +15,15 @@
     "folders": [
         {
             "path": "../../Core",
-            "name": "Shovel"
+            "name": "Shovel",
         },
         {
             "path": "../../Validator",
             "name": "Supporting/Validator",
         },
         {
             "path": "../../Shim",
-            "name": "Supporting/Validator"
+            "name": "Supporting/Validator",
         },
         {
             "path": "../../GithubActions",

diff --git a/.vscode/extensions.json b/.vscode/extensions.json
@@ -1,10 +1,10 @@
 {
     "recommendations": [
-        "EditorConfig.EditorConfig",
-        "ms-vscode.PowerShell",
-        "DavidAnson.vscode-markdownlint",
         "CoenraadS.bracket-pair-colorizer-2",
+        "DavidAnson.vscode-markdownlint",
+        "EditorConfig.EditorConfig",
         "fabiospampinato.vscode-terminals",
+        "ms-vscode.PowerShell",
         "redhat.vscode-yaml",
         "yzhang.markdown-all-in-one",
     ],

diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -1,4 +1,3 @@
-// Configure PSScriptAnalyzer settings
 {
     "powershell.scriptAnalysis.settingsPath": "PSScriptAnalyzerSettings.psd1",
     "powershell.codeFormatting.preset": "OTBS",

diff --git a/bin/missing-checkver.ps1 b/bin/missing-checkver.ps1
@@ -25,7 +25,7 @@ param(
 )
 
 'core', 'manifest' | ForEach-Object {
-    . "$PSscriptRoot\..\lib\$_.ps1"
+    . "$PSScriptRoot\..\lib\$_.ps1"
 }
 
 $Dir = Resolve-Path $Dir

diff --git a/lib/core.ps1 b/lib/core.ps1
@@ -579,7 +579,7 @@ function shim($path, $global, $name, $arg) {
     } else {
         # Setting PSScriptRoot in Shim if it is not defined, so the shim doesn't break in PowerShell 2.0
         Write-Output "if (!(Test-Path Variable:PSScriptRoot)) { `$PSScriptRoot = Split-Path `$MyInvocation.MyCommand.Path -Parent }" | Out-File "$shim.ps1" -Encoding utf8
-        write-output "`$path = join-path `"`$psscriptroot`" `"$relative_path`"" | out-file "$shim.ps1" -Encoding utf8 -Append
+        write-output "`$path = join-path `"`$PSScriptRoot`" `"$relative_path`"" | out-file "$shim.ps1" -Encoding utf8 -Append
     }
 
     if ($path -match '\.jar$') {

diff --git a/lib/json.ps1 b/lib/json.ps1
@@ -93,7 +93,7 @@ function ConvertToPrettyJson {
 }
 
 function json_path([String] $json, [String] $jsonpath, [Hashtable] $substitutions) {
-    Add-Type -Path "$psscriptroot\..\supporting\validator\bin\Newtonsoft.Json.dll"
+    Add-Type -Path "$PSScriptRoot\..\supporting\validator\bin\Newtonsoft.Json.dll"
     if ($null -ne $substitutions) {
         $jsonpath = substitute $jsonpath $substitutions ($jsonpath -like "*=~*")
     }

diff --git a/lib/manifest.ps1 b/lib/manifest.ps1
@@ -1,5 +1,5 @@
-. "$psscriptroot/core.ps1"
-. "$psscriptroot/autoupdate.ps1"
+. "$PSScriptRoot/core.ps1"
+. "$PSScriptRoot/autoupdate.ps1"
 
 function manifest_path($app, $bucket) {
     fullpath "$(Find-BucketDirectory $bucket)\$(sanitary_path $app).json"

diff --git a/libexec/scoop-cache.ps1 b/libexec/scoop-cache.ps1
@@ -12,14 +12,14 @@
 #     scoop cache rm *
 param($cmd, $app)
 
-. "$psscriptroot\..\lib\help.ps1"
+. "$PSScriptRoot\..\lib\help.ps1"
 
 reset_aliases
 
 function cacheinfo($file) {
     $app, $version, $url = $file.name -split '#'
     $size = filesize $file.length
-    return new-object psobject -prop @{ app = $app; version = $version; url = $url; size = $size }
+    return New-Object psobject -prop @{ app = $app; version = $version; url = $url; size = $size }
 }
 
 function show($app) {
@@ -40,7 +40,7 @@ switch ($cmd) {
     'rm' {
         if (!$app) { 'ERROR: <app> missing'; my_usage; exit 1 }
         Remove-Item "$cachedir\$app#*"
-        if (test-path("$cachedir\$app.txt")) {
+        if (Test-Path("$cachedir\$app.txt")) {
             Remove-Item "$cachedir\$app.txt"
         }
     }

diff --git a/libexec/scoop-cleanup.ps1 b/libexec/scoop-cleanup.ps1
@@ -9,13 +9,13 @@
 #   -g, --global       Cleanup a globally installed app
 #   -k, --cache        Remove outdated download cache
 
-. "$psscriptroot\..\lib\core.ps1"
-. "$psscriptroot\..\lib\manifest.ps1"
-. "$psscriptroot\..\lib\buckets.ps1"
-. "$psscriptroot\..\lib\versions.ps1"
-. "$psscriptroot\..\lib\getopt.ps1"
-. "$psscriptroot\..\lib\help.ps1"
-. "$psscriptroot\..\lib\install.ps1"
+. "$PSScriptRoot\..\lib\core.ps1"
+. "$PSScriptRoot\..\lib\manifest.ps1"
+. "$PSScriptRoot\..\lib\buckets.ps1"
+. "$PSScriptRoot\..\lib\versions.ps1"
+. "$PSScriptRoot\..\lib\getopt.ps1"
+. "$PSScriptRoot\..\lib\help.ps1"
+. "$PSScriptRoot\..\lib\install.ps1"
 
 reset_aliases
 
@@ -41,16 +41,16 @@ function cleanup($app, $global, $verbose, $cache) {
         return
     }
 
-    write-host -f yellow "Removing $app`:" -nonewline
+    Write-Host -f yellow "Removing $app`:" -nonewline
     $versions | ForEach-Object {
         $version = $_
-        write-host " $version" -nonewline
+        Write-Host " $version" -nonewline
         $dir = versiondir $app $version $global
         # unlink all potential old link before doing recursive Remove-Item
         unlink_persist_data $dir
         Remove-Item $dir -ErrorAction Stop -Recurse -Force
     }
-    write-host ''
+    Write-Host ''
 }
 
 if ($apps) {

diff --git a/libexec/scoop-config.ps1 b/libexec/scoop-config.ps1
@@ -86,7 +86,7 @@
 param($name, $value)
 
 'core', 'help' | ForEach-Object {
-    . "$psscriptroot\..\lib\$_.ps1"
+    . "$PSScriptRoot\..\lib\$_.ps1"
 }
 
 reset_aliases

diff --git a/libexec/scoop-depends.ps1 b/libexec/scoop-depends.ps1
@@ -1,31 +1,31 @@
 # Usage: scoop depends <app>
 # Summary: List dependencies for an app
 
-. "$psscriptroot\..\lib\depends.ps1"
-. "$psscriptroot\..\lib\install.ps1"
-. "$psscriptroot\..\lib\manifest.ps1"
-. "$psscriptroot\..\lib\buckets.ps1"
-. "$psscriptroot\..\lib\getopt.ps1"
-. "$psscriptroot\..\lib\decompress.ps1"
-. "$psscriptroot\..\lib\help.ps1"
+. "$PSScriptRoot\..\lib\depends.ps1"
+. "$PSScriptRoot\..\lib\install.ps1"
+. "$PSScriptRoot\..\lib\manifest.ps1"
+. "$PSScriptRoot\..\lib\buckets.ps1"
+. "$PSScriptRoot\..\lib\getopt.ps1"
+. "$PSScriptRoot\..\lib\decompress.ps1"
+. "$PSScriptRoot\..\lib\help.ps1"
 
 reset_aliases
 
 $opt, $apps, $err = getopt $args 'a:' 'arch='
 $app = $apps[0]
 
+# FIXME:
 if (!$app) { error '<app> missing'; my_usage; exit 1 }
 
 $architecture = default_architecture
 try {
     $architecture = ensure_architecture ($opt.a + $opt.arch)
 } catch {
+    # TODO: Stop-ScoopExecution
     abort "ERROR: $_"
 }
 
 $deps = @(deps $app $architecture)
-if ($deps) {
-    $deps[($deps.length - 1)..0]
-}
+if ($deps) { $deps[($deps.length - 1)..0] }
 
 exit 0
diff --git a/libexec/scoop-export.ps1 b/libexec/scoop-export.ps1
@@ -2,10 +2,10 @@
 # Summary: Exports (an importable) list of installed apps
 # Help: Lists all installed apps.
 
-. "$psscriptroot\..\lib\core.ps1"
-. "$psscriptroot\..\lib\versions.ps1"
-. "$psscriptroot\..\lib\manifest.ps1"
-. "$psscriptroot\..\lib\buckets.ps1"
+. "$PSScriptRoot\..\lib\core.ps1"
+. "$PSScriptRoot\..\lib\versions.ps1"
+. "$PSScriptRoot\..\lib\manifest.ps1"
+. "$PSScriptRoot\..\lib\buckets.ps1"
 
 reset_aliases
 $def_arch = default_architecture
@@ -16,9 +16,6 @@ $global = installed_apps $true | ForEach-Object { @{ name = $_; global = $true }
 $apps = @($local) + @($global)
 $count = 0
 
-# json
-# echo "{["
-
 if ($apps) {
     $apps | Sort-Object { $_.name } | Where-Object { !$query -or ($_.name -match $query) } | ForEach-Object {
         $app = $_.name
@@ -39,22 +36,11 @@ if ($apps) {
             $arch = ''
         }
 
-        # json
-        # $val = "{ 'name': '$app', 'version': '$ver', 'global': $($global.toString().tolower()) }"
-        # if($count -gt 0) {
-        #     " ," + $val
-        # } else {
-        #     "  " + $val
-        # }
-
         # "$app (v:$ver) global:$($global.toString().tolower())"
         "$app (v:$ver)$global_display$bucket$arch"
 
         $count++
     }
 }
 
-# json
-# echo "]}"
-
 exit 0
diff --git a/libexec/scoop-help.ps1 b/libexec/scoop-help.ps1
@@ -2,9 +2,9 @@
 # Summary: Show help for a command
 param($cmd)
 
-. "$psscriptroot\..\lib\core.ps1"
-. "$psscriptroot\..\lib\commands.ps1"
-. "$psscriptroot\..\lib\help.ps1"
+. "$PSScriptRoot\..\lib\core.ps1"
+. "$PSScriptRoot\..\lib\commands.ps1"
+. "$PSScriptRoot\..\lib\help.ps1"
 
 reset_aliases
 

diff --git a/libexec/scoop-hold.ps1 b/libexec/scoop-hold.ps1
@@ -1,8 +1,8 @@
 # Usage: scoop hold <apps>
 # Summary: Hold an app to disable updates
 
-. "$psscriptroot\..\lib\help.ps1"
-. "$psscriptroot\..\lib\manifest.ps1"
+. "$PSScriptRoot\..\lib\help.ps1"
+. "$PSScriptRoot\..\lib\manifest.ps1"
 
 reset_aliases
 $apps = $args

diff --git a/libexec/scoop-home.ps1 b/libexec/scoop-home.ps1
@@ -2,10 +2,10 @@
 # Summary: Opens the app homepage
 param($app)
 
-. "$psscriptroot\..\lib\core.ps1"
-. "$psscriptroot\..\lib\help.ps1"
-. "$psscriptroot\..\lib\manifest.ps1"
-. "$psscriptroot\..\lib\buckets.ps1"
+. "$PSScriptRoot\..\lib\core.ps1"
+. "$PSScriptRoot\..\lib\help.ps1"
+. "$PSScriptRoot\..\lib\manifest.ps1"
+. "$PSScriptRoot\..\lib\buckets.ps1"
 
 reset_aliases
 

diff --git a/libexec/scoop-info.ps1 b/libexec/scoop-info.ps1
@@ -2,13 +2,13 @@
 # Summary: Display information about an app
 param($app)
 
-. "$psscriptroot\..\lib\buckets.ps1"
-. "$psscriptroot\..\lib\core.ps1"
-. "$psscriptroot\..\lib\depends.ps1"
-. "$psscriptroot\..\lib\help.ps1"
-. "$psscriptroot\..\lib\install.ps1"
-. "$psscriptroot\..\lib\manifest.ps1"
-. "$psscriptroot\..\lib\versions.ps1"
+. "$PSScriptRoot\..\lib\buckets.ps1"
+. "$PSScriptRoot\..\lib\core.ps1"
+. "$PSScriptRoot\..\lib\depends.ps1"
+. "$PSScriptRoot\..\lib\help.ps1"
+. "$PSScriptRoot\..\lib\install.ps1"
+. "$PSScriptRoot\..\lib\manifest.ps1"
+. "$PSScriptRoot\..\lib\versions.ps1"
 
 reset_aliases
 

diff --git a/libexec/scoop-install.ps1 b/libexec/scoop-install.ps1
@@ -16,17 +16,17 @@
 #   -s, --skip                Skip hash validation (use with caution!)
 #   -a, --arch <32bit|64bit>  Use the specified architecture, if the app supports it
 
-. "$psscriptroot\..\lib\core.ps1"
-. "$psscriptroot\..\lib\manifest.ps1"
-. "$psscriptroot\..\lib\buckets.ps1"
-. "$psscriptroot\..\lib\decompress.ps1"
-. "$psscriptroot\..\lib\install.ps1"
-. "$psscriptroot\..\lib\shortcuts.ps1"
-. "$psscriptroot\..\lib\psmodules.ps1"
-. "$psscriptroot\..\lib\versions.ps1"
-. "$psscriptroot\..\lib\help.ps1"
-. "$psscriptroot\..\lib\getopt.ps1"
-. "$psscriptroot\..\lib\depends.ps1"
+. "$PSScriptRoot\..\lib\core.ps1"
+. "$PSScriptRoot\..\lib\manifest.ps1"
+. "$PSScriptRoot\..\lib\buckets.ps1"
+. "$PSScriptRoot\..\lib\decompress.ps1"
+. "$PSScriptRoot\..\lib\install.ps1"
+. "$PSScriptRoot\..\lib\shortcuts.ps1"
+. "$PSScriptRoot\..\lib\psmodules.ps1"
+. "$PSScriptRoot\..\lib\versions.ps1"
+. "$PSScriptRoot\..\lib\help.ps1"
+. "$PSScriptRoot\..\lib\getopt.ps1"
+. "$PSScriptRoot\..\lib\depends.ps1"
 
 reset_aliases
 

diff --git a/libexec/scoop-prefix.ps1 b/libexec/scoop-prefix.ps1
@@ -2,10 +2,10 @@
 # Summary: Returns the path to the specified app
 param($app)
 
-. "$psscriptroot\..\lib\core.ps1"
-. "$psscriptroot\..\lib\help.ps1"
-. "$psscriptroot\..\lib\manifest.ps1"
-. "$psscriptroot\..\lib\buckets.ps1"
+. "$PSScriptRoot\..\lib\core.ps1"
+. "$PSScriptRoot\..\lib\help.ps1"
+. "$PSScriptRoot\..\lib\manifest.ps1"
+. "$PSScriptRoot\..\lib\buckets.ps1"
 
 reset_aliases
 

diff --git a/libexec/scoop-reset.ps1 b/libexec/scoop-reset.ps1
@@ -4,13 +4,13 @@
 # if you've installed 'python' and 'python27', you can use 'scoop reset' to switch between
 # using one or the other.
 
-. "$psscriptroot\..\lib\core.ps1"
-. "$psscriptroot\..\lib\manifest.ps1"
-. "$psscriptroot\..\lib\help.ps1"
-. "$psscriptroot\..\lib\getopt.ps1"
-. "$psscriptroot\..\lib\install.ps1"
-. "$psscriptroot\..\lib\versions.ps1"
-. "$psscriptroot\..\lib\shortcuts.ps1"
+. "$PSScriptRoot\..\lib\core.ps1"
+. "$PSScriptRoot\..\lib\manifest.ps1"
+. "$PSScriptRoot\..\lib\help.ps1"
+. "$PSScriptRoot\..\lib\getopt.ps1"
+. "$PSScriptRoot\..\lib\install.ps1"
+. "$PSScriptRoot\..\lib\versions.ps1"
+. "$PSScriptRoot\..\lib\shortcuts.ps1"
 
 reset_aliases
 $opt, $apps, $err = getopt $args

diff --git a/libexec/scoop-search.ps1 b/libexec/scoop-search.ps1
@@ -5,10 +5,10 @@
 # If used with [query], shows app names that match the query.
 # Without [query], shows all the available apps.
 param($query)
-. "$psscriptroot\..\lib\core.ps1"
-. "$psscriptroot\..\lib\buckets.ps1"
-. "$psscriptroot\..\lib\manifest.ps1"
-. "$psscriptroot\..\lib\versions.ps1"
+. "$PSScriptRoot\..\lib\core.ps1"
+. "$PSScriptRoot\..\lib\buckets.ps1"
+. "$PSScriptRoot\..\lib\manifest.ps1"
+. "$PSScriptRoot\..\lib\versions.ps1"
 
 reset_aliases
 

diff --git a/libexec/scoop-status.ps1 b/libexec/scoop-status.ps1
@@ -1,12 +1,12 @@
 # Usage: scoop status
 # Summary: Show status and check for new app versions
 
-. "$psscriptroot\..\lib\core.ps1"
-. "$psscriptroot\..\lib\manifest.ps1"
-. "$psscriptroot\..\lib\buckets.ps1"
-. "$psscriptroot\..\lib\versions.ps1"
-. "$psscriptroot\..\lib\depends.ps1"
-. "$psscriptroot\..\lib\git.ps1"
+. "$PSScriptRoot\..\lib\core.ps1"
+. "$PSScriptRoot\..\lib\manifest.ps1"
+. "$PSScriptRoot\..\lib\buckets.ps1"
+. "$PSScriptRoot\..\lib\versions.ps1"
+. "$PSScriptRoot\..\lib\depends.ps1"
+. "$PSScriptRoot\..\lib\git.ps1"
 
 reset_aliases