Minor cleanup

Ash258 · Apr 25, 2020 · 1a88e05 · 1a88e05
1 parent 4a3509e
commit 1a88e05
Show file tree

Hide file tree

Showing 16 changed files with 56 additions and 82 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,5 @@
 .DS_Store
 ._.DS_Store
-scoop.sublime-workspace
 test/installer/tmp/*
 test/tmp/*
 *~

diff --git a/.vscode/extensions.json b/.vscode/extensions.json
@@ -1,6 +1,11 @@
 {
     "recommendations": [
         "EditorConfig.EditorConfig",
-        "ms-vscode.PowerShell"
-    ]
+        "ms-vscode.PowerShell",
+        "DavidAnson.vscode-markdownlint",
+        "CoenraadS.bracket-pair-colorizer-2",
+        "fabiospampinato.vscode-terminals",
+        "redhat.vscode-yaml",
+        "yzhang.markdown-all-in-one",
+    ],
 }
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -1,19 +1,7 @@
 // Configure PSScriptAnalyzer settings
 {
-    "[powershell]": {
-        // Disable formating until: https://github.com/PowerShell/vscode-powershell/issues/1019 is fixed
-        "editor.formatOnSave": false
-    },
     "powershell.scriptAnalysis.settingsPath": "PSScriptAnalyzerSettings.psd1",
     "powershell.codeFormatting.preset": "OTBS",
     "powershell.codeFormatting.alignPropertyValuePairs": true,
     "powershell.codeFormatting.ignoreOneLineBlock": true,
-    "files.exclude": {
-        "**/.git": true,
-        "**/.svn": true,
-        "**/.hg": true,
-        "**/CVS": true,
-        "**/.DS_Store": true,
-        "**/tmp": true
-    }
 }
diff --git a/_wiki/.gitkeep b/_wiki/.gitkeep
@@ -0,0 +1 @@
+Comfort CI
diff --git a/bin/auto-pr.ps1 b/bin/auto-pr.ps1
@@ -54,8 +54,9 @@ param(
     [Switch] $SkipUpdated
 )
 
-. "$PSScriptRoot\..\lib\manifest.ps1"
-. "$PSScriptRoot\..\lib\json.ps1"
+'manifest', 'json' | ForEach-Object {
+    . "$PSScriptRoot\..\lib\$_.ps1"
+}
 
 $Dir = Resolve-Path $Dir
 

diff --git a/bin/checkhashes.ps1 b/bin/checkhashes.ps1
@@ -3,7 +3,7 @@
     Check if ALL urls inside manifest have correct hashes.
 .PARAMETER App
     Manifest to be checked.
-    Wildcard is supported.
+    Wildcards are supported.
 .PARAMETER Dir
     Where to search for manifest(s).
 .PARAMETER Update
@@ -23,6 +23,7 @@
     Check MANIFEST and Update if there are some wrong hashes.
 #>
 param(
+    [SupportsWildcards()]
     [String] $App = '*',
     [Parameter(Mandatory = $true)]
     [ValidateScript( {
@@ -40,13 +41,9 @@ param(
     [Switch] $UseCache
 )
 
-. "$PSScriptRoot\..\lib\core.ps1"
-. "$PSScriptRoot\..\lib\manifest.ps1"
-. "$PSScriptRoot\..\lib\buckets.ps1"
-. "$PSScriptRoot\..\lib\autoupdate.ps1"
-. "$PSScriptRoot\..\lib\json.ps1"
-. "$PSScriptRoot\..\lib\versions.ps1"
-. "$PSScriptRoot\..\lib\install.ps1"
+'core', 'manifest', 'buckets', 'autoupdate', 'json', 'versions', 'install' | ForEach-Object {
+    . "$PSScriptRoot\..\lib\$_.ps1"
+}
 
 $Dir = Resolve-Path $Dir
 if ($ForceUpdate) { $Update = $true }

diff --git a/bin/checkurls.ps1 b/bin/checkurls.ps1
@@ -3,7 +3,7 @@
     List manifests which do not have valid URLs.
 .PARAMETER App
     Manifest name to search.
-    Placeholder is supported.
+    Wildcards is supported.
 .PARAMETER Dir
     Where to search for manifest(s).
 .PARAMETER Timeout
@@ -12,6 +12,7 @@
     Manifests will all valid URLs will not be shown.
 #>
 param(
+    [SupportsWildcards()]
     [String] $App = '*',
     [Parameter(Mandatory = $true)]
     [ValidateScript( {
@@ -26,9 +27,9 @@ param(
     [Switch] $SkipValid
 )
 
-. "$PSScriptRoot\..\lib\core.ps1"
-. "$PSScriptRoot\..\lib\manifest.ps1"
-. "$PSScriptRoot\..\lib\install.ps1"
+'core', 'manifest', 'install' | ForEach-Object {
+    . "$PSScriptRoot\..\lib\$_.ps1"
+}
 
 $Dir = Resolve-Path $Dir
 $Queue = @()

diff --git a/bin/checkver.ps1 b/bin/checkver.ps1
@@ -5,7 +5,7 @@
     Checks websites for newer versions using an (optional) regular expression defined in the manifest.
 .PARAMETER App
     Manifest name to search.
-    Placeholders are supported.
+    Wildcards are supported.
 .PARAMETER Dir
     Where to search for manifest(s).
 .PARAMETER Update
@@ -47,6 +47,7 @@
     Check manifest APP.json inside ./DIR directory and update if there is newer version.
 #>
 param(
+    [SupportsWildcards()]
     [String] $App = '*',
     [Parameter(Mandatory = $true)]
     [ValidateScript( {
@@ -63,13 +64,9 @@ param(
     [String] $Version = ''
 )
 
-. "$psscriptroot\..\lib\core.ps1"
-. "$psscriptroot\..\lib\manifest.ps1"
-. "$psscriptroot\..\lib\buckets.ps1"
-. "$psscriptroot\..\lib\autoupdate.ps1"
-. "$psscriptroot\..\lib\json.ps1"
-. "$psscriptroot\..\lib\versions.ps1"
-. "$psscriptroot\..\lib\install.ps1" # needed for hash generation
+'core', 'manifest', 'buckets', 'autoupdate', 'json', 'versions', 'install' | ForEach-Object {
+    . "$PSScriptRoot\..\lib\$_.ps1"
+}
 
 $Dir = Resolve-Path $Dir
 $Search = $App
@@ -258,7 +255,7 @@ while ($in_progress -gt 0) {
         }
 
         if ($match -and $match.Success) {
-            $matchesHashtable = @{}
+            $matchesHashtable = @{ }
             $regex.GetGroupNames() | ForEach-Object { $matchesHashtable.Add($_, $match.Groups[$_].Value) }
             $ver = $matchesHashtable['1']
             if ($replace) {

diff --git a/bin/describe.ps1 b/bin/describe.ps1
@@ -3,13 +3,14 @@
     Search for application description on homepage.
 .PARAMETER App
     Manifest name to search.
-    Placeholders are supported.
+    Wildcards are supported.
 .PARAMETER Dir
     Where to search for manifest(s).
 #>
 param(
+    [SupportsWildcards()]
     [String] $App = '*',
-    [Parameter(Mandatory = $true)]
+    [Parameter(Mandatory)]
     [ValidateScript( {
         if (!(Test-Path $_ -Type Container)) {
             throw "$_ is not a directory!"
@@ -20,9 +21,9 @@ param(
     [String] $Dir
 )
 
-. "$PSScriptRoot\..\lib\core.ps1"
-. "$PSScriptRoot\..\lib\manifest.ps1"
-. "$PSScriptRoot\..\lib\description.ps1"
+'core', 'manifest', 'description' | ForEach-Object {
+    . "$PSScriptRoot\..\lib\$_.ps1"
+}
 
 $Dir = Resolve-Path $Dir
 $Queue = @()

diff --git a/bin/formatjson.ps1 b/bin/formatjson.ps1
@@ -15,6 +15,7 @@
     Format manifest '7zip' inside bucket directory.
 #>
 param(
+    [SupportsWildcards()]
     [String] $App = '*',
     [Parameter(Mandatory = $true)]
     [ValidateScript( {
@@ -27,9 +28,9 @@ param(
     [String] $Dir
 )
 
-. "$PSScriptRoot\..\lib\core.ps1"
-. "$PSScriptRoot\..\lib\manifest.ps1"
-. "$PSScriptRoot\..\lib\json.ps1"
+'core', 'manifest', 'json' | ForEach-Object {
+    . "$PSScriptRoot\..\lib\$_.ps1"
+}
 
 $Dir = Resolve-Path $Dir
 

diff --git a/bin/install.ps1 b/bin/install.ps1
@@ -3,9 +3,9 @@
 # remote install:
 #   Invoke-Expression (New-Object System.Net.WebClient).DownloadString('https://get.scoop.sh')
 $old_erroractionpreference = $erroractionpreference
-$erroractionpreference = 'stop' # quit if anything goes wrong
+$ErrorActionPreference = 'Stop' # quit if anything goes wrong
 
-if (($PSVersionTable.PSVersion.Major) -lt 5) {
+if ($PSVersionTable.PSVersion.Major -lt 5) {
     Write-Output "PowerShell 5 or later is required to run Scoop."
     Write-Output "Upgrade PowerShell: https://docs.microsoft.com/en-us/powershell/scripting/setup/installing-windows-powershell"
     break
@@ -76,4 +76,4 @@ success 'Scoop was installed successfully!'
 
 Write-Output "Type 'scoop help' for instructions."
 
-$erroractionpreference = $old_erroractionpreference # Reset $erroractionpreference to original value
+$ErrorActionPreference = $old_erroractionpreference # Reset $erroractionpreference to original value
diff --git a/bin/missing-checkver.ps1 b/bin/missing-checkver.ps1
@@ -3,13 +3,14 @@
     Check if manifest contains checkver and autoupdate property.
 .PARAMETER App
     Manifest name.
-    Wirldcard is supported.
+    Wirldcards are supported.
 .PARAMETER Dir
     Location of manifests.
 .PARAMETER SkipSupported
     Manifests with checkver and autoupdate will not be presented.
 #>
 param(
+    [SupportsWildcards()]
     [String] $App = '*',
     [Parameter(Mandatory = $true)]
     [ValidateScript( {
@@ -23,8 +24,9 @@ param(
     [Switch] $SkipSupported
 )
 
-. "$PSScriptRoot\..\lib\core.ps1"
-. "$PSScriptRoot\..\lib\manifest.ps1"
+'core', 'manifest' | ForEach-Object {
+    . "$PSscriptRoot\..\lib\$_.ps1"
+}
 
 $Dir = Resolve-Path $Dir
 

diff --git a/bin/refresh.ps1 b/bin/refresh.ps1
diff --git a/bin/scoop.ps1 b/bin/scoop.ps1
@@ -1,11 +1,13 @@
-#requires -v 3
+#Requires -Version 5
 param($cmd)
 
-set-strictmode -off
+Set-StrictMode -off
 
-. "$psscriptroot\..\lib\core.ps1"
-. "$psscriptroot\..\lib\git.ps1"
-. "$psscriptroot\..\lib\buckets.ps1"
+'core', 'git', 'buckets' | ForEach-Object {
+    . "$PSScriptRoot\..\lib\$_.ps1"
+}
+
+# TODO: ???
 . (relpath '..\lib\commands')
 
 reset_aliases

diff --git a/bin/test.ps1 b/bin/test.ps1
@@ -1 +1 @@
-invoke-pester "$psscriptroot\..\test"
+Invoke-Pester "$PSScriptRoot\..\test"
diff --git a/bin/uninstall.ps1 b/bin/uninstall.ps1
@@ -11,11 +11,9 @@ param(
     [bool] $purge
 )
 
-. "$PSScriptRoot\..\lib\core.ps1"
-. "$PSScriptRoot\..\lib\install.ps1"
-. "$PSScriptRoot\..\lib\shortcuts.ps1"
-. "$PSScriptRoot\..\lib\versions.ps1"
-. "$PSScriptRoot\..\lib\manifest.ps1"
+'core', 'install', 'shortcuts', 'versions', 'manifest' | ForEach-Object {
+    . "$PSScriptRoot\..\lib\$_.ps1"
+}
 
 if ($global -and !(is_admin)) {
     error 'You need admin rights to uninstall globally.'