From d1da9c006b29c399c86093720ceb874cd589db9e Mon Sep 17 00:00:00 2001 From: Nathan Baulch Date: Tue, 15 Oct 2024 14:15:27 +1100 Subject: [PATCH] Fix typos --- CHANGELOG.md | 4 ++-- PSScriptAnalyzerSettings.psd1 | 2 +- README.md | 2 +- bin/checkhashes.ps1 | 4 ++-- bin/missing-checkver.ps1 | 2 +- bin/uninstall.ps1 | 2 +- lib/core.ps1 | 2 +- lib/decompress.ps1 | 4 ++-- lib/depends.ps1 | 2 +- lib/download.ps1 | 2 +- lib/json.ps1 | 2 +- libexec/scoop-config.ps1 | 6 +++--- libexec/scoop-install.ps1 | 2 +- libexec/scoop-uninstall.ps1 | 2 +- libexec/scoop-virustotal.ps1 | 2 +- test/Scoop-Decompress.Tests.ps1 | 4 ++-- 16 files changed, 22 insertions(+), 22 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d9a56e46ad..bc54623265 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -468,7 +468,7 @@ ### Documentation -- **changelog:** Add 'CHANGLOG.md' ([#4600](https://github.com/ScoopInstaller/Scoop/issues/4600)) +- **changelog:** Add 'CHANGELOG.md' ([#4600](https://github.com/ScoopInstaller/Scoop/issues/4600)) - **changelog:** Rearrange CHANGELOG ([#4729](https://github.com/ScoopInstaller/Scoop/issues/4729)) - **changelog:** Link CHANGELOG headers to 'releases/tag' ([#4730](https://github.com/ScoopInstaller/Scoop/issues/4730)) @@ -569,7 +569,7 @@ - **autoupdate:** Add $urlNoExt and $basenameNoExt substitutions ([#3742](https://github.com/ScoopInstaller/Scoop/issues/3742)) - **config:** Add configuration option for default architecture ([#3778](https://github.com/ScoopInstaller/Scoop/issues/3778)) - **install:** Follow HTTP redirections when downloading a file ([#3902](https://github.com/ScoopInstaller/Scoop/issues/3902)) -- **install:** Let pathes in 'env_add_path' be added ascendantly ([#3788](https://github.com/ScoopInstaller/Scoop/issues/3788), [#3976](https://github.com/ScoopInstaller/Scoop/issues/3976)) +- **install:** Let paths in 'env_add_path' be added ascendantly ([#3788](https://github.com/ScoopInstaller/Scoop/issues/3788), [#3976](https://github.com/ScoopInstaller/Scoop/issues/3976)) - **list:** Display main bucket name ([#3759](https://github.com/ScoopInstaller/Scoop/issues/3759)) - **shim:** Add alt-shim support ([#3998](https://github.com/ScoopInstaller/Scoop/issues/3998)) - **scoop-checkup:** Add check_envs_requirements ([#3860](https://github.com/ScoopInstaller/Scoop/issues/3860)) diff --git a/PSScriptAnalyzerSettings.psd1 b/PSScriptAnalyzerSettings.psd1 index 9ef165869e..ff38f138da 100644 --- a/PSScriptAnalyzerSettings.psd1 +++ b/PSScriptAnalyzerSettings.psd1 @@ -5,7 +5,7 @@ Severity = @('Error') # Analyze **only** the following rules. Use IncludeRules when you want - # to invoke only a small subset of the defualt rules. + # to invoke only a small subset of the default rules. # IncludeRules = @('PSAvoidDefaultValueSwitchParameter', # 'PSMisleadingBacktick', # 'PSMissingModuleManifestField', diff --git a/README.md b/README.md index 641c0f6d76..3ed516404c 100644 --- a/README.md +++ b/README.md @@ -100,7 +100,7 @@ You can tweak the following `aria2` settings with the `scoop config` command: ## What sort of apps can Scoop install? -The apps that are most likely to get installed fine with Scoop are those referred to as "portable" apps. These apps are compressed files which can run standalone after being extracted. This type of apps does not produce side effects like changing the Windows Registry or placing files outside the app directory. +The apps that are most likely to get installed fine with Scoop are those referred to as "portable" apps. These apps are compressed files which can run standalone after being extracted. This type of app does not produce side effects like changing the Windows Registry or placing files outside the app directory. Scoop also supports installer files and their uninstallation methods. Likewise, it can handle single-file apps and PowerShell scripts. These do not even need to be compressed. See the [runat](https://github.com/ScoopInstaller/Main/blob/master/bucket/runat.json) package for an example: it is simply a GitHub gist. diff --git a/bin/checkhashes.ps1 b/bin/checkhashes.ps1 index 6e6420fb2a..9ae35d751b 100644 --- a/bin/checkhashes.ps1 +++ b/bin/checkhashes.ps1 @@ -64,7 +64,7 @@ foreach ($single in Get-ChildItem $Dir -Filter "$App.json" -Recurse) { $file = $single.FullName $manifest = parse_json $file - # Skip nighly manifests, since their hash validation is skipped + # Skip nightly manifests, since their hash validation is skipped if ($manifest.version -eq 'nightly') { continue } $urls = @() @@ -166,7 +166,7 @@ foreach ($current in $MANIFESTS) { $32bit_count = 0 $arm64_count = 0 - # 64bit is get, donwloaded and added first + # 64bit is get, downloaded and added first if ($platforms.Contains('64bit')) { $64bit_count = $current.manifest.architecture.'64bit'.hash.Count $current.manifest.architecture.'64bit'.hash = $actuals[0..($64bit_count - 1)] diff --git a/bin/missing-checkver.ps1 b/bin/missing-checkver.ps1 index 3ba2d2d660..d502bd8814 100644 --- a/bin/missing-checkver.ps1 +++ b/bin/missing-checkver.ps1 @@ -3,7 +3,7 @@ Check if manifest contains checkver and autoupdate property. .PARAMETER App Manifest name. - Wirldcard is supported. + Wildcard is supported. .PARAMETER Dir Location of manifests. .PARAMETER SkipSupported diff --git a/bin/uninstall.ps1 b/bin/uninstall.ps1 index 2e2dc36ea8..670d49df8d 100644 --- a/bin/uninstall.ps1 +++ b/bin/uninstall.ps1 @@ -46,7 +46,7 @@ function do_uninstall($app, $global) { rm_shims $app $manifest $global $architecture # If a junction was used during install, that will have been used - # as the reference directory. Othewise it will just be the version + # as the reference directory. Otherwise it will just be the version # directory. $refdir = unlink_current (appdir $app $global) diff --git a/lib/core.ps1 b/lib/core.ps1 index c271ce8f94..c92eabc0f0 100644 --- a/lib/core.ps1 +++ b/lib/core.ps1 @@ -610,7 +610,7 @@ function Get-AbsolutePath { Path to manipulate .OUTPUTS System.String - Absolute path, may or maynot existed + Absolute path, may or may not existed #> [CmdletBinding()] [OutputType([string])] diff --git a/lib/decompress.ps1 b/lib/decompress.ps1 index 964c7ca5df..5f8d073432 100644 --- a/lib/decompress.ps1 +++ b/lib/decompress.ps1 @@ -134,10 +134,10 @@ function Expand-7zipArchive { } if ($Removal) { if (($Path -replace '.*\.([^\.]*)$', '$1') -eq '001') { - # Remove splitted 7-zip archive parts + # Remove split 7-zip archive parts Get-ChildItem "$($Path -replace '\.[^\.]*$', '').???" | Remove-Item -Force } elseif (($Path -replace '.*\.part(\d+)\.rar$', '$1')[-1] -eq '1') { - # Remove splitted RAR archive parts + # Remove split RAR archive parts Get-ChildItem "$($Path -replace '\.part(\d+)\.rar$', '').part*.rar" | Remove-Item -Force } else { # Remove original archive file diff --git a/lib/depends.ps1 b/lib/depends.ps1 index 3a38ca2b23..bc832d7baf 100644 --- a/lib/depends.ps1 +++ b/lib/depends.ps1 @@ -15,7 +15,7 @@ function Get-Dependency { List of app's dependencies .NOTES When pipeline input is used, the output will have duplicate items, and should be filtered by 'Select-Object -Unique'. - ALgorithm: http://www.electricmonk.nl/docs/dependency_resolving_algorithm/dependency_resolving_algorithm.html + Algorithm: http://www.electricmonk.nl/docs/dependency_resolving_algorithm/dependency_resolving_algorithm.html #> [CmdletBinding()] [OutputType([Object[]])] diff --git a/lib/download.ps1 b/lib/download.ps1 index 70641cca7f..2a72f8a1c3 100644 --- a/lib/download.ps1 +++ b/lib/download.ps1 @@ -434,7 +434,7 @@ function Invoke-CachedAria2Download ($app, $version, $manifest, $architecture, $ # Skip blank lines if ([String]::IsNullOrWhiteSpace($_)) { return } - # Prevent potential overlaping of text when one line is shorter + # Prevent potential overlapping of text when one line is shorter $len = $Host.UI.RawUI.WindowSize.Width - $_.Length - 20 $blank = if ($len -gt 0) { ' ' * $len } else { '' } $color = 'Gray' diff --git a/lib/json.ps1 b/lib/json.ps1 index d6fd3621b5..d82dbb9b73 100644 --- a/lib/json.ps1 +++ b/lib/json.ps1 @@ -132,7 +132,7 @@ function json_path_legacy([String] $json, [String] $jsonpath, [Hashtable] $subst $jsonpath.split('.') | ForEach-Object { $el = $_ - # substitute the basename and version varibales into the jsonpath + # substitute the basename and version variables into the jsonpath if ($null -ne $substitutions) { $el = substitute $el $substitutions } diff --git a/libexec/scoop-config.ps1 b/libexec/scoop-config.ps1 index 6007bd6434..c949d0bb4c 100644 --- a/libexec/scoop-config.ps1 +++ b/libexec/scoop-config.ps1 @@ -34,7 +34,7 @@ # The 'current' version alias will not be used. Shims and shortcuts will point to specific version instead. # # scoop_repo: http://github.com/ScoopInstaller/Scoop -# Git repository containining scoop source code. +# Git repository containing scoop source code. # This configuration is useful for custom forks. # # scoop_branch: master|develop @@ -137,7 +137,7 @@ # See: 'https://aria2.github.io/manual/en/html/aria2c.html#cmdoption-retry-wait' # # aria2-split: 5 -# Number of connections used for downlaod. +# Number of connections used for download. # See: 'https://aria2.github.io/manual/en/html/aria2c.html#cmdoption-s' # # aria2-max-connection-per-server: 5 @@ -145,7 +145,7 @@ # See: 'https://aria2.github.io/manual/en/html/aria2c.html#cmdoption-x' # # aria2-min-split-size: 5M -# Downloaded files will be splitted by this configured size and downloaded using multiple connections. +# Downloaded files will be split by this configured size and downloaded using multiple connections. # See: 'https://aria2.github.io/manual/en/html/aria2c.html#cmdoption-k' # # aria2-options: diff --git a/libexec/scoop-install.ps1 b/libexec/scoop-install.ps1 index 0fadcff09d..39ab26c9fa 100644 --- a/libexec/scoop-install.ps1 +++ b/libexec/scoop-install.ps1 @@ -109,7 +109,7 @@ $specific_versions_paths = $specific_versions | ForEach-Object { } $apps = @((@($specific_versions_paths) + $difference) | Where-Object { $_ } | Select-Object -Unique) -# remember which were explictly requested so that we can +# remember which were explicitly requested so that we can # differentiate after dependencies are added $explicit_apps = $apps diff --git a/libexec/scoop-uninstall.ps1 b/libexec/scoop-uninstall.ps1 index 5ad606a461..2b335122c6 100644 --- a/libexec/scoop-uninstall.ps1 +++ b/libexec/scoop-uninstall.ps1 @@ -129,7 +129,7 @@ if (!$apps) { exit 0 } } } - # purge persistant data + # purge persistent data if ($purge) { Write-Host 'Removing persisted data.' $persist_dir = persistdir $app $global diff --git a/libexec/scoop-virustotal.ps1 b/libexec/scoop-virustotal.ps1 index 72f1d2f14f..9397d9c914 100644 --- a/libexec/scoop-virustotal.ps1 +++ b/libexec/scoop-virustotal.ps1 @@ -205,7 +205,7 @@ Function Get-VirusTotalResultByUrl ($url, $app) { # - $url: where file to check can be downloaded # - $app: Name of the application (used for reporting) # - $do_scan: [boolean flag] whether to actually submit to VirusTotal -# This is a parameter instead of conditionnally calling +# This is a parameter instead of conditionally calling # the function to consolidate the warning message # - $retrying: [boolean] Optional, for internal use to retry # submitting the file after a delay if the rate limit is diff --git a/test/Scoop-Decompress.Tests.ps1 b/test/Scoop-Decompress.Tests.ps1 index e635492cec..989a3bbb81 100644 --- a/test/Scoop-Decompress.Tests.ps1 +++ b/test/Scoop-Decompress.Tests.ps1 @@ -107,14 +107,14 @@ Describe 'Decompression function' -Tag 'Scoop', 'Windows', 'Decompress' { (Get-ChildItem $to).Count | Should -Be 1 } - It 'extract splited 7z archives (.001, .002, ...)' { + It 'extract split 7z archives (.001, .002, ...)' { $to = test_extract 'Expand-7zipArchive' $test5_1 $to | Should -Exist "$to\empty" | Should -Exist (Get-ChildItem $to).Count | Should -Be 1 } - It 'extract splited RAR archives (.part01.rar, .part02.rar, ...)' { + It 'extract split RAR archives (.part01.rar, .part02.rar, ...)' { $to = test_extract 'Expand-7zipArchive' $test6_1 $to | Should -Exist "$to\dummy" | Should -Exist