Skip to content

Commit 6f3fc15

Browse files
authored
Merge pull request chocolatey#2466 from jsoref/spelling
(chocolatey#2465) Fix numerous spelling mistakes
2 parents 89dc404 + 372ffa1 commit 6f3fc15

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+125
-125
lines changed

GenerateDocs.ps1

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -156,19 +156,19 @@ function Convert-Syntax($objItem, $hasCmdletBinding) {
156156
}
157157

158158
function Convert-Parameter($objItem, $commandName) {
159-
$parmText = $lineFeed + "### -$($objItem.name.substring(0,1).ToUpper() + $objItem.name.substring(1))"
159+
$paramText = $lineFeed + "### -$($objItem.name.substring(0,1).ToUpper() + $objItem.name.substring(1))"
160160
if ( ($objItem.parameterValue -ne $null) -and ($objItem.parameterValue -ne 'SwitchParameter') ) {
161-
$parmText += ' '
162-
if ([string]($objItem.required) -eq 'false') { $parmText += "["}
163-
$parmText += "<$($objItem.parameterValue)>"
164-
if ([string]($objItem.required) -eq 'false') { $parmText += "]"}
161+
$paramText += ' '
162+
if ([string]($objItem.required) -eq 'false') { $paramText += "["}
163+
$paramText += "<$($objItem.parameterValue)>"
164+
if ([string]($objItem.required) -eq 'false') { $paramText += "]"}
165165
}
166-
$parmText += $lineFeed
166+
$paramText += $lineFeed
167167
if ($objItem.description -ne $null) {
168168
$parmText += (($objItem.description | ForEach-Object { Replace-CommonItems $_.Text }) -join "$lineFeed") + $lineFeed + $lineFeed
169169
}
170170
if ($objItem.parameterValueGroup -ne $null) {
171-
$parmText += "$($lineFeed)Valid options: " + ($objItem.parameterValueGroup.parameterValue -join ", ") + $lineFeed + $lineFeed
171+
$paramText += "$($lineFeed)Valid options: " + ($objItem.parameterValueGroup.parameterValue -join ", ") + $lineFeed + $lineFeed
172172
}
173173

174174
$aliases = [string]((Get-Command -Name $commandName).parameters."$($objItem.Name)".Aliases -join ', ')
@@ -179,7 +179,7 @@ function Convert-Parameter($objItem, $commandName) {
179179

180180
$padding = ($aliases.Length, $required.Length, $position.Length, $defValue.Length, $acceptPipeline.Length | Measure-Object -Maximum).Maximum
181181

182-
$parmText += @"
182+
$paramText += @"
183183
Property | Value
184184
---------------------- | $([string]('-' * $padding))
185185
Aliases | $($aliases)
@@ -190,7 +190,7 @@ Accept Pipeline Input? | $($acceptPipeline)
190190
191191
"@
192192

193-
Write-Output $parmText
193+
Write-Output $paramText
194194
}
195195

196196
function Convert-CommandText {
@@ -519,7 +519,7 @@ Some environment variables are set based on options that are passed, configurati
519519
#### Business Edition Variables
520520
521521
* ChocolateyInstallArgumentsSensitive - Encrypted arguments passed from command line `--install-arguments-sensitive` that are not logged anywhere. (0.10.1+ and licensed editions 1.6.0+)
522-
* ChocolateyPackageParametersSensitive - Package parameters passed from command line `--package-parameters-senstivite` that are not logged anywhere. (0.10.1+ and licensed editions 1.6.0+)
522+
* ChocolateyPackageParametersSensitive - Package parameters passed from command line `--package-parameters-sensitive` that are not logged anywhere. (0.10.1+ and licensed editions 1.6.0+)
523523
* ChocolateyLicensedVersion - What version is the licensed edition on?
524524
* ChocolateyLicenseType - What edition / type of the licensed edition is installed?
525525

docker/Install-ChocolateyInContainer.ps1

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ param (
2626
if ($env:TEMP -eq $null) {
2727
$env:TEMP = Join-Path $env:SystemDrive 'temp'
2828
}
29-
$chocTempDir = Join-Path $env:TEMP "chocolatey"
30-
$tempDir = Join-Path $chocTempDir "chocInstall"
29+
$chocoTempDir = Join-Path $env:TEMP "chocolatey"
30+
$tempDir = Join-Path $chocoTempDir "chocoInstall"
3131
if (![System.IO.Directory]::Exists($tempDir)) {[System.IO.Directory]::CreateDirectory($tempDir)}
3232
$file = Join-Path $tempDir "chocolatey.zip"
3333
Copy-Item $chocolateyPackageFilePath $file -Force
@@ -72,13 +72,13 @@ param (
7272
# Call chocolatey install
7373
Write-Output "Installing chocolatey on this machine"
7474
$toolsFolder = Join-Path $tempDir "tools"
75-
$chocInstallPS1 = Join-Path $toolsFolder "chocolateyInstall.ps1"
75+
$chocoInstallPS1 = Join-Path $toolsFolder "chocolateyInstall.ps1"
7676

77-
& $chocInstallPS1
77+
& $chocoInstallPS1
7878

7979
Write-Output 'Ensuring chocolatey commands are on the path'
80-
$chocInstallVariableName = "ChocolateyInstall"
81-
$chocoPath = [Environment]::GetEnvironmentVariable($chocInstallVariableName)
80+
$chocoInstallVariableName = "ChocolateyInstall"
81+
$chocoPath = [Environment]::GetEnvironmentVariable($chocoInstallVariableName)
8282
if ($chocoPath -eq $null -or $chocoPath -eq '') {
8383
$chocoPath = 'C:\ProgramData\Chocolatey'
8484
}

nuspec/chocolatey/chocolatey/tools/chocolateysetup.psm1

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
$thisScriptFolder = (Split-Path -parent $MyInvocation.MyCommand.Definition)
2-
$chocInstallVariableName = "ChocolateyInstall"
2+
$chocoInstallVariableName = "ChocolateyInstall"
33
$sysDrive = $env:SystemDrive
44
$tempDir = $env:TEMP
55
$defaultChocolateyPathOld = "$sysDrive\Chocolatey"
@@ -224,24 +224,24 @@ param(
224224

225225
$environmentTarget = [System.EnvironmentVariableTarget]::User
226226
# removing old variable
227-
Install-ChocolateyEnvironmentVariable -variableName "$chocInstallVariableName" -variableValue $null -variableType $environmentTarget
227+
Install-ChocolateyEnvironmentVariable -variableName "$chocoInstallVariableName" -variableValue $null -variableType $environmentTarget
228228
if (Test-ProcessAdminRights) {
229229
Write-Debug "Administrator installing so using Machine environment variable target instead of User."
230230
$environmentTarget = [System.EnvironmentVariableTarget]::Machine
231231
# removing old variable
232-
Install-ChocolateyEnvironmentVariable -variableName "$chocInstallVariableName" -variableValue $null -variableType $environmentTarget
232+
Install-ChocolateyEnvironmentVariable -variableName "$chocoInstallVariableName" -variableValue $null -variableType $environmentTarget
233233
} else {
234234
Write-ChocolateyWarning "Setting ChocolateyInstall Environment Variable on USER and not SYSTEM variables.`n This is due to either non-administrator install OR the process you are running is not being run as an Administrator."
235235
}
236236

237-
Write-Output "Creating $chocInstallVariableName as an environment variable (targeting `'$environmentTarget`') `n Setting $chocInstallVariableName to `'$folder`'"
237+
Write-Output "Creating $chocoInstallVariableName as an environment variable (targeting `'$environmentTarget`') `n Setting $chocoInstallVariableName to `'$folder`'"
238238
Write-ChocolateyWarning "It's very likely you will need to close and reopen your shell `n before you can use choco."
239-
Install-ChocolateyEnvironmentVariable -variableName "$chocInstallVariableName" -variableValue "$folder" -variableType $environmentTarget
239+
Install-ChocolateyEnvironmentVariable -variableName "$chocoInstallVariableName" -variableValue "$folder" -variableType $environmentTarget
240240
}
241241

242242
function Get-ChocolateyInstallFolder(){
243243
Write-Debug "Get-ChocolateyInstallFolder"
244-
[Environment]::GetEnvironmentVariable($chocInstallVariableName)
244+
[Environment]::GetEnvironmentVariable($chocoInstallVariableName)
245245
}
246246

247247
function Create-DirectoryIfNotExists($folderName){
@@ -473,13 +473,13 @@ param(
473473
}
474474

475475
Write-Debug "Unpacking files required for Chocolatey."
476-
$chocInstallFolder = Join-Path $thisScriptFolder "chocolateyInstall"
477-
$chocoExe = Join-Path $chocInstallFolder 'choco.exe'
476+
$chocoInstallFolder = Join-Path $thisScriptFolder "chocolateyInstall"
477+
$chocoExe = Join-Path $chocoInstallFolder 'choco.exe'
478478
$chocoExeDest = Join-Path $chocolateyPath 'choco.exe'
479479
Copy-Item $chocoExe $chocoExeDest -force
480480

481-
Write-Debug "Copying the contents of `'$chocInstallFolder`' to `'$chocolateyPath`'."
482-
Copy-Item $chocInstallFolder\* $chocolateyPath -Recurse -Force
481+
Write-Debug "Copying the contents of `'$chocoInstallFolder`' to `'$chocolateyPath`'."
482+
Copy-Item $chocoInstallFolder\* $chocolateyPath -Recurse -Force
483483
}
484484

485485
function Ensure-ChocolateyLibFiles {
@@ -493,7 +493,7 @@ param(
493493

494494
if (!(Test-Path("$chocoPkgDirectory\chocolatey.nupkg"))) {
495495
Write-Output "chocolatey.nupkg file not installed in lib.`n Attempting to locate it from bootstrapper."
496-
$chocoZipFile = Join-Path $tempDir "chocolatey\chocInstall\chocolatey.zip"
496+
$chocoZipFile = Join-Path $tempDir "chocolatey\chocoInstall\chocolatey.zip"
497497

498498
Write-Debug "First the zip file at '$chocoZipFile'."
499499
Write-Debug "Then from a neighboring chocolatey.*nupkg file '$thisScriptFolder/../../'."
@@ -579,7 +579,7 @@ param(
579579
function Initialize-ChocolateyPath {
580580
param(
581581
[string]$chocolateyExePath = "$($env:ALLUSERSPROFILE)\chocolatey\bin",
582-
[string]$chocolateyExePathVariable = "%$($chocInstallVariableName)%\bin"
582+
[string]$chocolateyExePathVariable = "%$($chocoInstallVariableName)%\bin"
583583
)
584584
Write-Debug "Initialize-ChocolateyPath"
585585
Write-Debug "Initializing Chocolatey Path if required"
@@ -597,7 +597,7 @@ param(
597597
function Process-ChocolateyBinFiles {
598598
param(
599599
[string]$chocolateyExePath = "$($env:ALLUSERSPROFILE)\chocolatey\bin",
600-
[string]$chocolateyExePathVariable = "%$($chocInstallVariableName)%\bin"
600+
[string]$chocolateyExePathVariable = "%$($chocoInstallVariableName)%\bin"
601601
)
602602
Write-Debug "Process-ChocolateyBinFiles"
603603
$processedMarkerFile = Join-Path $chocolateyExePath '_processed.txt'
@@ -801,7 +801,7 @@ function Invoke-Chocolatey-Initial {
801801
& $chocoExe -v | Out-Null
802802
Write-Debug "Chocolatey execution completed successfully."
803803
} catch {
804-
Write-ChocolateyWarning "Unable to run Chocolately at this time. It is likely that .Net Framework installation requires a system reboot"
804+
Write-ChocolateyWarning "Unable to run Chocolatey at this time. It is likely that .Net Framework installation requires a system reboot"
805805
}
806806
}
807807

src/chocolatey.resources/helpers/chocolateyScriptRunner.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ $nugetExePath = Join-Path $nuGetPath 'bin'
3838
$nugetLibPath = Join-Path $nuGetPath 'lib'
3939
$badLibPath = Join-Path $nuGetPath 'lib-bad'
4040
$extensionsPath = Join-Path $nugetPath 'extensions'
41-
$chocInstallVariableName = "ChocolateyInstall"
41+
$chocoInstallVariableName = "ChocolateyInstall"
4242
$chocoTools = Join-Path $nuGetPath 'tools'
4343
$nugetExe = Join-Path $chocoTools 'nuget.exe'
4444
$7zip = Join-Path $chocoTools '7z.exe'

src/chocolatey.resources/helpers/functions/Get-ChocolateyWebFile.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
function Get-ChocolateyWebFile {
1818
<#
1919
.SYNOPSIS
20-
Downloads a file from the internets.
20+
Downloads a file from the internet.
2121
2222
.DESCRIPTION
2323
This will download a file from a url, tracking with a progress bar.

src/chocolatey.resources/helpers/functions/Get-FtpFile.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
function Get-FtpFile {
1717
<#
1818
.SYNOPSIS
19-
Downloads a file from a File Transfter Protocol (FTP) location.
19+
Downloads a file from a File Transfer Protocol (FTP) location.
2020
2121
.DESCRIPTION
2222
This will download a file from an FTP location, saving the file to the

src/chocolatey.resources/helpers/functions/Get-OSArchitectureWidth.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ None
4444
4545
.PARAMETER Compare
4646
This optional parameter causes the function to return $true or $false,
47-
depending on wether or not the bit width matches.
47+
depending on whether or not the bit width matches.
4848
#>
4949
param(
5050
$compare

src/chocolatey.resources/helpers/functions/Install-ChocolateyEnvironmentVariable.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ The name or key of the environment variable
4848
A string value assigned to the above name.
4949
5050
.PARAMETER VariableType
51-
Specifies whether this variable is to be accesible at either the
51+
Specifies whether this variable is to be accessible at either the
5252
individual user level or at the Machine level.
5353
5454
.PARAMETER IgnoredArguments
@@ -64,7 +64,7 @@ Install-ChocolateyEnvironmentVariable "JAVA_HOME" "d:\oracle\jdk\bin"
6464
>
6565
# Creates a User environment variable "_NT_SYMBOL_PATH" pointing to
6666
# "symsrv*symsrv.dll*f:\localsymbols*http://msdl.microsoft.com/download/symbols".
67-
# The command will be elevated to admin priviledges.
67+
# The command will be elevated to admin privileges.
6868
Install-ChocolateyEnvironmentVariable `
6969
-VariableName "_NT_SYMBOL_PATH" `
7070
-VariableValue "symsrv*symsrv.dll*f:\localsymbols*http://msdl.microsoft.com/download/symbols" `

src/chocolatey.resources/helpers/functions/Install-ChocolateyInstallPackage.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -328,7 +328,7 @@ Pro / Business supports a single, ubiquitous install directory option.
328328
if ($fileType -like 'msi') {
329329
$msiArgs = "/i `"$fileFullPath`""
330330
$msiArgs = if ($overrideArguments) {
331-
Write-Host "Overriding package arguments with '$additonalInstallArgs' (replacing '$silentArgs')"
331+
Write-Host "Overriding package arguments with '$additionalInstallArgs' (replacing '$silentArgs')"
332332
"$msiArgs $additionalInstallArgs"
333333
}
334334
else {

src/chocolatey.resources/helpers/functions/Install-ChocolateyPackage.ps1

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ Allows splatting with arguments that do not apply. Do not use directly.
224224
Specifies the commands to run after download has completed but before install steps have begun.
225225
Available in 0.11.0+.
226226
227-
Use this for starting an auxilary process such as AutoHotkey, so that any timeouts are not
227+
Use this for starting an auxiliary process such as AutoHotkey, so that any timeouts are not
228228
affected by the time to download.
229229
230230
.EXAMPLE
@@ -305,7 +305,7 @@ Install-ChocolateyPackage 'StExBar' 'msi' '/quiet' `
305305
.EXAMPLE
306306
>
307307
Install-ChocolateyPackage 'mono' 'exe' '/SILENT' `
308-
'http://somehwere/something.exe' -ValidExitCodes @(0,21)
308+
'http://somewhere/something.exe' -ValidExitCodes @(0,21)
309309
310310
.EXAMPLE
311311
>
@@ -371,8 +371,8 @@ param(
371371

372372
Write-FunctionCallLogMessage -Invocation $MyInvocation -Parameters $PSBoundParameters
373373

374-
$chocTempDir = $env:TEMP
375-
$tempDir = Join-Path $chocTempDir "$($env:chocolateyPackageName)"
374+
$chocoTempDir = $env:TEMP
375+
$tempDir = Join-Path $chocoTempDir "$($env:chocolateyPackageName)"
376376
if ($env:chocolateyPackageVersion -ne $null) { $tempDir = Join-Path $tempDir "$($env:chocolateyPackageVersion)"; }
377377
$tempDir = $tempDir -replace '\\chocolatey\\chocolatey\\', '\chocolatey\'
378378
if (![System.IO.Directory]::Exists($tempDir)) { [System.IO.Directory]::CreateDirectory($tempDir) | Out-Null }

0 commit comments

Comments
 (0)