diff --git a/GenerateDocs.ps1 b/GenerateDocs.ps1 index 6d1bdd77c3..406251f20e 100644 --- a/GenerateDocs.ps1 +++ b/GenerateDocs.ps1 @@ -156,19 +156,19 @@ function Convert-Syntax($objItem, $hasCmdletBinding) { } function Convert-Parameter($objItem, $commandName) { - $parmText = $lineFeed + "### -$($objItem.name.substring(0,1).ToUpper() + $objItem.name.substring(1))" + $paramText = $lineFeed + "### -$($objItem.name.substring(0,1).ToUpper() + $objItem.name.substring(1))" if ( ($objItem.parameterValue -ne $null) -and ($objItem.parameterValue -ne 'SwitchParameter') ) { - $parmText += ' ' - if ([string]($objItem.required) -eq 'false') { $parmText += "["} - $parmText += "<$($objItem.parameterValue)>" - if ([string]($objItem.required) -eq 'false') { $parmText += "]"} + $paramText += ' ' + if ([string]($objItem.required) -eq 'false') { $paramText += "["} + $paramText += "<$($objItem.parameterValue)>" + if ([string]($objItem.required) -eq 'false') { $paramText += "]"} } - $parmText += $lineFeed + $paramText += $lineFeed if ($objItem.description -ne $null) { $parmText += (($objItem.description | ForEach-Object { Replace-CommonItems $_.Text }) -join "$lineFeed") + $lineFeed + $lineFeed } if ($objItem.parameterValueGroup -ne $null) { - $parmText += "$($lineFeed)Valid options: " + ($objItem.parameterValueGroup.parameterValue -join ", ") + $lineFeed + $lineFeed + $paramText += "$($lineFeed)Valid options: " + ($objItem.parameterValueGroup.parameterValue -join ", ") + $lineFeed + $lineFeed } $aliases = [string]((Get-Command -Name $commandName).parameters."$($objItem.Name)".Aliases -join ', ') @@ -179,7 +179,7 @@ function Convert-Parameter($objItem, $commandName) { $padding = ($aliases.Length, $required.Length, $position.Length, $defValue.Length, $acceptPipeline.Length | Measure-Object -Maximum).Maximum - $parmText += @" + $paramText += @" Property | Value ---------------------- | $([string]('-' * $padding)) Aliases | $($aliases) @@ -190,7 +190,7 @@ Accept Pipeline Input? | $($acceptPipeline) "@ - Write-Output $parmText + Write-Output $paramText } function Convert-CommandText { @@ -519,7 +519,7 @@ Some environment variables are set based on options that are passed, configurati #### Business Edition Variables * ChocolateyInstallArgumentsSensitive - Encrypted arguments passed from command line `--install-arguments-sensitive` that are not logged anywhere. (0.10.1+ and licensed editions 1.6.0+) - * ChocolateyPackageParametersSensitive - Package parameters passed from command line `--package-parameters-senstivite` that are not logged anywhere. (0.10.1+ and licensed editions 1.6.0+) + * ChocolateyPackageParametersSensitive - Package parameters passed from command line `--package-parameters-sensitive` that are not logged anywhere. (0.10.1+ and licensed editions 1.6.0+) * ChocolateyLicensedVersion - What version is the licensed edition on? * ChocolateyLicenseType - What edition / type of the licensed edition is installed? diff --git a/docker/Install-ChocolateyInContainer.ps1 b/docker/Install-ChocolateyInContainer.ps1 index 821e565893..35e5505250 100644 --- a/docker/Install-ChocolateyInContainer.ps1 +++ b/docker/Install-ChocolateyInContainer.ps1 @@ -26,8 +26,8 @@ param ( if ($env:TEMP -eq $null) { $env:TEMP = Join-Path $env:SystemDrive 'temp' } - $chocTempDir = Join-Path $env:TEMP "chocolatey" - $tempDir = Join-Path $chocTempDir "chocInstall" + $chocoTempDir = Join-Path $env:TEMP "chocolatey" + $tempDir = Join-Path $chocoTempDir "chocoInstall" if (![System.IO.Directory]::Exists($tempDir)) {[System.IO.Directory]::CreateDirectory($tempDir)} $file = Join-Path $tempDir "chocolatey.zip" Copy-Item $chocolateyPackageFilePath $file -Force @@ -72,13 +72,13 @@ param ( # Call chocolatey install Write-Output "Installing chocolatey on this machine" $toolsFolder = Join-Path $tempDir "tools" - $chocInstallPS1 = Join-Path $toolsFolder "chocolateyInstall.ps1" + $chocoInstallPS1 = Join-Path $toolsFolder "chocolateyInstall.ps1" - & $chocInstallPS1 + & $chocoInstallPS1 Write-Output 'Ensuring chocolatey commands are on the path' - $chocInstallVariableName = "ChocolateyInstall" - $chocoPath = [Environment]::GetEnvironmentVariable($chocInstallVariableName) + $chocoInstallVariableName = "ChocolateyInstall" + $chocoPath = [Environment]::GetEnvironmentVariable($chocoInstallVariableName) if ($chocoPath -eq $null -or $chocoPath -eq '') { $chocoPath = 'C:\ProgramData\Chocolatey' } diff --git a/nuspec/chocolatey/chocolatey/tools/chocolateysetup.psm1 b/nuspec/chocolatey/chocolatey/tools/chocolateysetup.psm1 index 109ce86d9d..c507bb363b 100644 --- a/nuspec/chocolatey/chocolatey/tools/chocolateysetup.psm1 +++ b/nuspec/chocolatey/chocolatey/tools/chocolateysetup.psm1 @@ -1,5 +1,5 @@ $thisScriptFolder = (Split-Path -parent $MyInvocation.MyCommand.Definition) -$chocInstallVariableName = "ChocolateyInstall" +$chocoInstallVariableName = "ChocolateyInstall" $sysDrive = $env:SystemDrive $tempDir = $env:TEMP $defaultChocolateyPathOld = "$sysDrive\Chocolatey" @@ -224,24 +224,24 @@ param( $environmentTarget = [System.EnvironmentVariableTarget]::User # removing old variable - Install-ChocolateyEnvironmentVariable -variableName "$chocInstallVariableName" -variableValue $null -variableType $environmentTarget + Install-ChocolateyEnvironmentVariable -variableName "$chocoInstallVariableName" -variableValue $null -variableType $environmentTarget if (Test-ProcessAdminRights) { Write-Debug "Administrator installing so using Machine environment variable target instead of User." $environmentTarget = [System.EnvironmentVariableTarget]::Machine # removing old variable - Install-ChocolateyEnvironmentVariable -variableName "$chocInstallVariableName" -variableValue $null -variableType $environmentTarget + Install-ChocolateyEnvironmentVariable -variableName "$chocoInstallVariableName" -variableValue $null -variableType $environmentTarget } else { 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." } - Write-Output "Creating $chocInstallVariableName as an environment variable (targeting `'$environmentTarget`') `n Setting $chocInstallVariableName to `'$folder`'" + Write-Output "Creating $chocoInstallVariableName as an environment variable (targeting `'$environmentTarget`') `n Setting $chocoInstallVariableName to `'$folder`'" Write-ChocolateyWarning "It's very likely you will need to close and reopen your shell `n before you can use choco." - Install-ChocolateyEnvironmentVariable -variableName "$chocInstallVariableName" -variableValue "$folder" -variableType $environmentTarget + Install-ChocolateyEnvironmentVariable -variableName "$chocoInstallVariableName" -variableValue "$folder" -variableType $environmentTarget } function Get-ChocolateyInstallFolder(){ Write-Debug "Get-ChocolateyInstallFolder" - [Environment]::GetEnvironmentVariable($chocInstallVariableName) + [Environment]::GetEnvironmentVariable($chocoInstallVariableName) } function Create-DirectoryIfNotExists($folderName){ @@ -473,13 +473,13 @@ param( } Write-Debug "Unpacking files required for Chocolatey." - $chocInstallFolder = Join-Path $thisScriptFolder "chocolateyInstall" - $chocoExe = Join-Path $chocInstallFolder 'choco.exe' + $chocoInstallFolder = Join-Path $thisScriptFolder "chocolateyInstall" + $chocoExe = Join-Path $chocoInstallFolder 'choco.exe' $chocoExeDest = Join-Path $chocolateyPath 'choco.exe' Copy-Item $chocoExe $chocoExeDest -force - Write-Debug "Copying the contents of `'$chocInstallFolder`' to `'$chocolateyPath`'." - Copy-Item $chocInstallFolder\* $chocolateyPath -Recurse -Force + Write-Debug "Copying the contents of `'$chocoInstallFolder`' to `'$chocolateyPath`'." + Copy-Item $chocoInstallFolder\* $chocolateyPath -Recurse -Force } function Ensure-ChocolateyLibFiles { @@ -493,7 +493,7 @@ param( if (!(Test-Path("$chocoPkgDirectory\chocolatey.nupkg"))) { Write-Output "chocolatey.nupkg file not installed in lib.`n Attempting to locate it from bootstrapper." - $chocoZipFile = Join-Path $tempDir "chocolatey\chocInstall\chocolatey.zip" + $chocoZipFile = Join-Path $tempDir "chocolatey\chocoInstall\chocolatey.zip" Write-Debug "First the zip file at '$chocoZipFile'." Write-Debug "Then from a neighboring chocolatey.*nupkg file '$thisScriptFolder/../../'." @@ -579,7 +579,7 @@ param( function Initialize-ChocolateyPath { param( [string]$chocolateyExePath = "$($env:ALLUSERSPROFILE)\chocolatey\bin", - [string]$chocolateyExePathVariable = "%$($chocInstallVariableName)%\bin" + [string]$chocolateyExePathVariable = "%$($chocoInstallVariableName)%\bin" ) Write-Debug "Initialize-ChocolateyPath" Write-Debug "Initializing Chocolatey Path if required" @@ -597,7 +597,7 @@ param( function Process-ChocolateyBinFiles { param( [string]$chocolateyExePath = "$($env:ALLUSERSPROFILE)\chocolatey\bin", - [string]$chocolateyExePathVariable = "%$($chocInstallVariableName)%\bin" + [string]$chocolateyExePathVariable = "%$($chocoInstallVariableName)%\bin" ) Write-Debug "Process-ChocolateyBinFiles" $processedMarkerFile = Join-Path $chocolateyExePath '_processed.txt' @@ -801,7 +801,7 @@ function Invoke-Chocolatey-Initial { & $chocoExe -v | Out-Null Write-Debug "Chocolatey execution completed successfully." } catch { - Write-ChocolateyWarning "Unable to run Chocolately at this time. It is likely that .Net Framework installation requires a system reboot" + Write-ChocolateyWarning "Unable to run Chocolatey at this time. It is likely that .Net Framework installation requires a system reboot" } } diff --git a/src/chocolatey.resources/helpers/chocolateyScriptRunner.ps1 b/src/chocolatey.resources/helpers/chocolateyScriptRunner.ps1 index 0ac80e8699..6bea170b55 100644 --- a/src/chocolatey.resources/helpers/chocolateyScriptRunner.ps1 +++ b/src/chocolatey.resources/helpers/chocolateyScriptRunner.ps1 @@ -38,7 +38,7 @@ $nugetExePath = Join-Path $nuGetPath 'bin' $nugetLibPath = Join-Path $nuGetPath 'lib' $badLibPath = Join-Path $nuGetPath 'lib-bad' $extensionsPath = Join-Path $nugetPath 'extensions' -$chocInstallVariableName = "ChocolateyInstall" +$chocoInstallVariableName = "ChocolateyInstall" $chocoTools = Join-Path $nuGetPath 'tools' $nugetExe = Join-Path $chocoTools 'nuget.exe' $7zip = Join-Path $chocoTools '7z.exe' diff --git a/src/chocolatey.resources/helpers/functions/Get-ChocolateyWebFile.ps1 b/src/chocolatey.resources/helpers/functions/Get-ChocolateyWebFile.ps1 index 1ea2d5214e..c07996d095 100644 --- a/src/chocolatey.resources/helpers/functions/Get-ChocolateyWebFile.ps1 +++ b/src/chocolatey.resources/helpers/functions/Get-ChocolateyWebFile.ps1 @@ -17,7 +17,7 @@ function Get-ChocolateyWebFile { <# .SYNOPSIS -Downloads a file from the internets. +Downloads a file from the internet. .DESCRIPTION This will download a file from a url, tracking with a progress bar. diff --git a/src/chocolatey.resources/helpers/functions/Get-FtpFile.ps1 b/src/chocolatey.resources/helpers/functions/Get-FtpFile.ps1 index 731d97edd1..4906c1ce34 100644 --- a/src/chocolatey.resources/helpers/functions/Get-FtpFile.ps1 +++ b/src/chocolatey.resources/helpers/functions/Get-FtpFile.ps1 @@ -16,7 +16,7 @@ function Get-FtpFile { <# .SYNOPSIS -Downloads a file from a File Transfter Protocol (FTP) location. +Downloads a file from a File Transfer Protocol (FTP) location. .DESCRIPTION This will download a file from an FTP location, saving the file to the diff --git a/src/chocolatey.resources/helpers/functions/Get-OSArchitectureWidth.ps1 b/src/chocolatey.resources/helpers/functions/Get-OSArchitectureWidth.ps1 index ed08fce8c8..eee31cecb2 100644 --- a/src/chocolatey.resources/helpers/functions/Get-OSArchitectureWidth.ps1 +++ b/src/chocolatey.resources/helpers/functions/Get-OSArchitectureWidth.ps1 @@ -44,7 +44,7 @@ None .PARAMETER Compare This optional parameter causes the function to return $true or $false, -depending on wether or not the bit width matches. +depending on whether or not the bit width matches. #> param( $compare diff --git a/src/chocolatey.resources/helpers/functions/Install-ChocolateyEnvironmentVariable.ps1 b/src/chocolatey.resources/helpers/functions/Install-ChocolateyEnvironmentVariable.ps1 index a46dc86449..f571b7de68 100644 --- a/src/chocolatey.resources/helpers/functions/Install-ChocolateyEnvironmentVariable.ps1 +++ b/src/chocolatey.resources/helpers/functions/Install-ChocolateyEnvironmentVariable.ps1 @@ -48,7 +48,7 @@ The name or key of the environment variable A string value assigned to the above name. .PARAMETER VariableType -Specifies whether this variable is to be accesible at either the +Specifies whether this variable is to be accessible at either the individual user level or at the Machine level. .PARAMETER IgnoredArguments @@ -64,7 +64,7 @@ Install-ChocolateyEnvironmentVariable "JAVA_HOME" "d:\oracle\jdk\bin" > # Creates a User environment variable "_NT_SYMBOL_PATH" pointing to # "symsrv*symsrv.dll*f:\localsymbols*http://msdl.microsoft.com/download/symbols". -# The command will be elevated to admin priviledges. +# The command will be elevated to admin privileges. Install-ChocolateyEnvironmentVariable ` -VariableName "_NT_SYMBOL_PATH" ` -VariableValue "symsrv*symsrv.dll*f:\localsymbols*http://msdl.microsoft.com/download/symbols" ` diff --git a/src/chocolatey.resources/helpers/functions/Install-ChocolateyInstallPackage.ps1 b/src/chocolatey.resources/helpers/functions/Install-ChocolateyInstallPackage.ps1 index b5ce8dafc2..c3ee1b9af3 100644 --- a/src/chocolatey.resources/helpers/functions/Install-ChocolateyInstallPackage.ps1 +++ b/src/chocolatey.resources/helpers/functions/Install-ChocolateyInstallPackage.ps1 @@ -328,7 +328,7 @@ Pro / Business supports a single, ubiquitous install directory option. if ($fileType -like 'msi') { $msiArgs = "/i `"$fileFullPath`"" $msiArgs = if ($overrideArguments) { - Write-Host "Overriding package arguments with '$additonalInstallArgs' (replacing '$silentArgs')" + Write-Host "Overriding package arguments with '$additionalInstallArgs' (replacing '$silentArgs')" "$msiArgs $additionalInstallArgs" } else { diff --git a/src/chocolatey.resources/helpers/functions/Install-ChocolateyPackage.ps1 b/src/chocolatey.resources/helpers/functions/Install-ChocolateyPackage.ps1 index 8dea2890fe..c0629760df 100644 --- a/src/chocolatey.resources/helpers/functions/Install-ChocolateyPackage.ps1 +++ b/src/chocolatey.resources/helpers/functions/Install-ChocolateyPackage.ps1 @@ -224,7 +224,7 @@ Allows splatting with arguments that do not apply. Do not use directly. Specifies the commands to run after download has completed but before install steps have begun. Available in 0.11.0+. -Use this for starting an auxilary process such as AutoHotkey, so that any timeouts are not +Use this for starting an auxiliary process such as AutoHotkey, so that any timeouts are not affected by the time to download. .EXAMPLE @@ -305,7 +305,7 @@ Install-ChocolateyPackage 'StExBar' 'msi' '/quiet' ` .EXAMPLE > Install-ChocolateyPackage 'mono' 'exe' '/SILENT' ` - 'http://somehwere/something.exe' -ValidExitCodes @(0,21) + 'http://somewhere/something.exe' -ValidExitCodes @(0,21) .EXAMPLE > @@ -371,8 +371,8 @@ param( Write-FunctionCallLogMessage -Invocation $MyInvocation -Parameters $PSBoundParameters - $chocTempDir = $env:TEMP - $tempDir = Join-Path $chocTempDir "$($env:chocolateyPackageName)" + $chocoTempDir = $env:TEMP + $tempDir = Join-Path $chocoTempDir "$($env:chocolateyPackageName)" if ($env:chocolateyPackageVersion -ne $null) { $tempDir = Join-Path $tempDir "$($env:chocolateyPackageVersion)"; } $tempDir = $tempDir -replace '\\chocolatey\\chocolatey\\', '\chocolatey\' if (![System.IO.Directory]::Exists($tempDir)) { [System.IO.Directory]::CreateDirectory($tempDir) | Out-Null } diff --git a/src/chocolatey.resources/helpers/functions/Install-ChocolateyVsixPackage.ps1 b/src/chocolatey.resources/helpers/functions/Install-ChocolateyVsixPackage.ps1 index a113fb9ffb..e86a4bfadc 100644 --- a/src/chocolatey.resources/helpers/functions/Install-ChocolateyVsixPackage.ps1 +++ b/src/chocolatey.resources/helpers/functions/Install-ChocolateyVsixPackage.ps1 @@ -58,7 +58,7 @@ In 0.10.4+, `Url` is an alias for VsixUrl. The major version number of Visual Studio where the package should be installed. This is optional. If not specified, the most recent Visual Studio installation -will be targetted. +will be targeted. NOTE: For Visual Studio 2015, the VsVersion is 14. It can be determined by looking at the folders under Program Files / Program Files (x86). diff --git a/src/chocolatey.resources/helpers/functions/Install-ChocolateyZipPackage.ps1 b/src/chocolatey.resources/helpers/functions/Install-ChocolateyZipPackage.ps1 index 873739a61b..12ebe80d29 100644 --- a/src/chocolatey.resources/helpers/functions/Install-ChocolateyZipPackage.ps1 +++ b/src/chocolatey.resources/helpers/functions/Install-ChocolateyZipPackage.ps1 @@ -198,8 +198,8 @@ param( $fileType = 'zip' - $chocTempDir = $env:TEMP - $tempDir = Join-Path $chocTempDir "$($env:chocolateyPackageName)" + $chocoTempDir = $env:TEMP + $tempDir = Join-Path $chocoTempDir "$($env:chocolateyPackageName)" if ($env:chocolateyPackageVersion -ne $null) { $tempDir = Join-Path $tempDir "$($env:chocolateyPackageVersion)"; } $tempDir = $tempDir -replace '\\chocolatey\\chocolatey\\', '\chocolatey\' if (![System.IO.Directory]::Exists($tempDir)) { [System.IO.Directory]::CreateDirectory($tempDir) | Out-Null } diff --git a/src/chocolatey.resources/helpers/functions/UnInstall-ChocolateyZipPackage.ps1 b/src/chocolatey.resources/helpers/functions/UnInstall-ChocolateyZipPackage.ps1 index e2825b4124..2a8ea90c82 100644 --- a/src/chocolatey.resources/helpers/functions/UnInstall-ChocolateyZipPackage.ps1 +++ b/src/chocolatey.resources/helpers/functions/UnInstall-ChocolateyZipPackage.ps1 @@ -24,7 +24,7 @@ This will uninstall a zip file if installed via Install-ChocolateyZipPackage. This is not necessary if the files are unzipped to the package directory. .NOTES -Not necessary if files are unzippped to package directory. +Not necessary if files are unzipped to package directory. This helper reduces the number of lines one would have to remove the files extracted from a previously installed zip file. diff --git a/src/chocolatey.resources/helpers/functions/Uninstall-ChocolateyPackage.ps1 b/src/chocolatey.resources/helpers/functions/Uninstall-ChocolateyPackage.ps1 index 46a10f677e..992d1ccf16 100644 --- a/src/chocolatey.resources/helpers/functions/Uninstall-ChocolateyPackage.ps1 +++ b/src/chocolatey.resources/helpers/functions/Uninstall-ChocolateyPackage.ps1 @@ -34,7 +34,7 @@ to reverse the installation done in the install script. With auto uninstaller turned off, a chocolateyUninstall.ps1 is required to perform uninstall from "Programs and Features". In the absence of chocolateyUninstall.ps1, choco uninstall only removes the package from -Chocolatey but does not remove the sofware from your system without +Chocolatey but does not remove the software from your system without auto uninstaller. .NOTES diff --git a/src/chocolatey.resources/helpers/functions/Update-SessionEnvironment.ps1 b/src/chocolatey.resources/helpers/functions/Update-SessionEnvironment.ps1 index f6b53f6c85..0c89dca3ec 100644 --- a/src/chocolatey.resources/helpers/functions/Update-SessionEnvironment.ps1 +++ b/src/chocolatey.resources/helpers/functions/Update-SessionEnvironment.ps1 @@ -18,7 +18,7 @@ function Update-SessionEnvironment { <# .SYNOPSIS Updates the environment variables of the current powershell session with -any environment variable changes that may have occured during a +any environment variable changes that may have occurred during a Chocolatey package install. .DESCRIPTION diff --git a/src/chocolatey.tests.integration/chocolatey.tests.integration.csproj b/src/chocolatey.tests.integration/chocolatey.tests.integration.csproj index fb776e6508..950ac93c6a 100644 --- a/src/chocolatey.tests.integration/chocolatey.tests.integration.csproj +++ b/src/chocolatey.tests.integration/chocolatey.tests.integration.csproj @@ -99,7 +99,7 @@ - + diff --git a/src/chocolatey.tests.integration/infrastructure/cryptography/CrytpoHashProviderSpecs.cs b/src/chocolatey.tests.integration/infrastructure/cryptography/CryptoHashProviderSpecs.cs similarity index 90% rename from src/chocolatey.tests.integration/infrastructure/cryptography/CrytpoHashProviderSpecs.cs rename to src/chocolatey.tests.integration/infrastructure/cryptography/CryptoHashProviderSpecs.cs index 2fcd247466..9249067706 100644 --- a/src/chocolatey.tests.integration/infrastructure/cryptography/CrytpoHashProviderSpecs.cs +++ b/src/chocolatey.tests.integration/infrastructure/cryptography/CryptoHashProviderSpecs.cs @@ -23,9 +23,9 @@ namespace chocolatey.tests.integration.infrastructure.cryptography using chocolatey.infrastructure.filesystem; using Should; - public class CrytpoHashProviderSpecs + public class CryptoHashProviderSpecs { - public abstract class CrytpoHashProviderSpecsBase : TinySpec + public abstract class CryptoHashProviderSpecsBase : TinySpec { protected CryptoHashProvider Provider; protected DotNetFileSystem FileSystem; @@ -39,7 +39,7 @@ public override void Context() } } - public class when_HashProvider_provides_a_hash : CrytpoHashProviderSpecsBase + public class when_HashProvider_provides_a_hash : CryptoHashProviderSpecsBase { private string result; private string filePath; diff --git a/src/chocolatey.tests.integration/scenarios/UpgradeScenarios.cs b/src/chocolatey.tests.integration/scenarios/UpgradeScenarios.cs index 33e166a92b..8b607110d0 100644 --- a/src/chocolatey.tests.integration/scenarios/UpgradeScenarios.cs +++ b/src/chocolatey.tests.integration/scenarios/UpgradeScenarios.cs @@ -164,7 +164,7 @@ public override void Context() { base.Context(); Configuration.Noop = true; - Configuration.PackageNames = Configuration.Input = "nonexistingpackage"; + Configuration.PackageNames = Configuration.Input = "nonexistentpackage"; } public override void Because() @@ -178,7 +178,7 @@ public void should_contain_a_message_the_package_was_not_found() bool expectedMessage = false; foreach (var message in MockLogger.MessagesFor(LogLevel.Error).or_empty_list_if_null()) { - if (message.Contains("nonexistingpackage not installed. The package was not found with the source(s) listed")) expectedMessage = true; + if (message.Contains("nonexistentpackage not installed. The package was not found with the source(s) listed")) expectedMessage = true; } expectedMessage.ShouldBeTrue(); @@ -728,7 +728,7 @@ public void should_have_executed_chocolateyInstall_script_for_new_package() } } - public class when_upgrading_an_existing_prerelease_package_with_prerelease_available_with_excludeprelease_and_without_prerelease_specified : ScenariosBase + public class when_upgrading_an_existing_prerelease_package_with_prerelease_available_with_excludeprerelease_and_without_prerelease_specified : ScenariosBase { private PackageResult _packageResult; @@ -820,7 +820,7 @@ public void should_only_find_the_last_stable_version() } } - public class when_upgrading_an_existing_prerelease_package_with_allow_downgrade_with_excludeprelease_and_without_prerelease_specified : ScenariosBase + public class when_upgrading_an_existing_prerelease_package_with_allow_downgrade_with_excludeprerelease_and_without_prerelease_specified : ScenariosBase { private PackageResult _packageResult; @@ -1696,7 +1696,7 @@ public class when_upgrading_a_package_that_does_not_exist : ScenariosBase public override void Context() { base.Context(); - Configuration.PackageNames = Configuration.Input = "nonexistingpackage"; + Configuration.PackageNames = Configuration.Input = "nonexistentpackage"; } public override void Because() @@ -1719,7 +1719,7 @@ public void should_contain_a_message_the_package_was_not_found() bool expectedMessage = false; foreach (var message in MockLogger.MessagesFor(LogLevel.Error).or_empty_list_if_null()) { - if (message.Contains("nonexistingpackage not installed. The package was not found with the source(s) listed")) expectedMessage = true; + if (message.Contains("nonexistentpackage not installed. The package was not found with the source(s) listed")) expectedMessage = true; } expectedMessage.ShouldBeTrue(); diff --git a/src/chocolatey.tests/chocolatey.tests.csproj b/src/chocolatey.tests/chocolatey.tests.csproj index 8536ebaace..10e34886c4 100644 --- a/src/chocolatey.tests/chocolatey.tests.csproj +++ b/src/chocolatey.tests/chocolatey.tests.csproj @@ -121,7 +121,7 @@ - + diff --git a/src/chocolatey.tests/infrastructure.app/commands/ChocolateyApiKeyCommandSpecs.cs b/src/chocolatey.tests/infrastructure.app/commands/ChocolateyApiKeyCommandSpecs.cs index a742e6191e..ff955a763b 100644 --- a/src/chocolatey.tests/infrastructure.app/commands/ChocolateyApiKeyCommandSpecs.cs +++ b/src/chocolatey.tests/infrastructure.app/commands/ChocolateyApiKeyCommandSpecs.cs @@ -133,7 +133,7 @@ public void should_throw_when_key_is_set_without_a_source() { configuration.ApiKeyCommand.Key = "bob"; configuration.Sources = ""; - var errorred = false; + var errored = false; Exception error = null; try @@ -142,11 +142,11 @@ public void should_throw_when_key_is_set_without_a_source() } catch (Exception ex) { - errorred = true; + errored = true; error = ex; } - errorred.ShouldBeTrue(); + errored.ShouldBeTrue(); error.ShouldNotBeNull(); error.ShouldBeType(); } @@ -172,7 +172,7 @@ public void should_throw_when_key_is_removed_without_a_source() { configuration.ApiKeyCommand.Remove = true; configuration.Sources = ""; - var errorred = false; + var errored = false; Exception error = null; try @@ -181,11 +181,11 @@ public void should_throw_when_key_is_removed_without_a_source() } catch (Exception ex) { - errorred = true; + errored = true; error = ex; } - errorred.ShouldBeTrue(); + errored.ShouldBeTrue(); error.ShouldNotBeNull(); error.ShouldBeType(); } diff --git a/src/chocolatey.tests/infrastructure.app/commands/ChocolateyFeatureCommandSpecs.cs b/src/chocolatey.tests/infrastructure.app/commands/ChocolateyFeatureCommandSpecs.cs index e4a7affbec..da75160718 100644 --- a/src/chocolatey.tests/infrastructure.app/commands/ChocolateyFeatureCommandSpecs.cs +++ b/src/chocolatey.tests/infrastructure.app/commands/ChocolateyFeatureCommandSpecs.cs @@ -126,7 +126,7 @@ public void should_throw_when_more_than_one_unparsed_arg_is_passed() reset(); unparsedArgs.Add("wtf"); unparsedArgs.Add("bbq"); - var errorred = false; + var errored = false; Exception error = null; try @@ -135,11 +135,11 @@ public void should_throw_when_more_than_one_unparsed_arg_is_passed() } catch (Exception ex) { - errorred = true; + errored = true; error = ex; } - errorred.ShouldBeTrue(); + errored.ShouldBeTrue(); error.ShouldNotBeNull(); error.ShouldBeType(); error.Message.ShouldContain("A single features command must be listed"); @@ -209,7 +209,7 @@ public void should_throw_when_command_is_not_list_and_name_is_not_set() { configuration.FeatureCommand.Command = FeatureCommandType.unknown; configuration.FeatureCommand.Name = ""; - var errorred = false; + var errored = false; Exception error = null; try @@ -218,11 +218,11 @@ public void should_throw_when_command_is_not_list_and_name_is_not_set() } catch (Exception ex) { - errorred = true; + errored = true; error = ex; } - errorred.ShouldBeTrue(); + errored.ShouldBeTrue(); error.ShouldNotBeNull(); error.ShouldBeType(); error.Message.ShouldEqual("When specifying the subcommand '{0}', you must also specify --name.".format_with(configuration.FeatureCommand.Command.to_string())); diff --git a/src/chocolatey.tests/infrastructure.app/commands/ChocolateyInstallCommandSpecs.cs b/src/chocolatey.tests/infrastructure.app/commands/ChocolateyInstallCommandSpecs.cs index 77783d989b..cf45b7efd6 100644 --- a/src/chocolatey.tests/infrastructure.app/commands/ChocolateyInstallCommandSpecs.cs +++ b/src/chocolatey.tests/infrastructure.app/commands/ChocolateyInstallCommandSpecs.cs @@ -270,7 +270,7 @@ public override void Because() public void should_throw_when_packagenames_is_not_set() { configuration.PackageNames = ""; - var errorred = false; + var errored = false; Exception error = null; try @@ -279,11 +279,11 @@ public void should_throw_when_packagenames_is_not_set() } catch (Exception ex) { - errorred = true; + errored = true; error = ex; } - errorred.ShouldBeTrue(); + errored.ShouldBeTrue(); error.ShouldNotBeNull(); error.ShouldBeType(); } diff --git a/src/chocolatey.tests/infrastructure.app/commands/ChocolateyNewCommandSpecs.cs b/src/chocolatey.tests/infrastructure.app/commands/ChocolateyNewCommandSpecs.cs index 8dbcf31a3a..01bf43a1a0 100644 --- a/src/chocolatey.tests/infrastructure.app/commands/ChocolateyNewCommandSpecs.cs +++ b/src/chocolatey.tests/infrastructure.app/commands/ChocolateyNewCommandSpecs.cs @@ -307,7 +307,7 @@ public override void Because() public void should_throw_when_Name_is_not_set() { configuration.NewCommand.Name = ""; - var errorred = false; + var errored = false; Exception error = null; try @@ -316,11 +316,11 @@ public void should_throw_when_Name_is_not_set() } catch (Exception ex) { - errorred = true; + errored = true; error = ex; } - errorred.ShouldBeTrue(); + errored.ShouldBeTrue(); error.ShouldNotBeNull(); error.ShouldBeType(); } diff --git a/src/chocolatey.tests/infrastructure.app/commands/ChocolateyOutdatedCommandSpecs.cs b/src/chocolatey.tests/infrastructure.app/commands/ChocolateyOutdatedCommandSpecs.cs index 2b18e7e314..199f31c365 100644 --- a/src/chocolatey.tests/infrastructure.app/commands/ChocolateyOutdatedCommandSpecs.cs +++ b/src/chocolatey.tests/infrastructure.app/commands/ChocolateyOutdatedCommandSpecs.cs @@ -137,7 +137,7 @@ public override void Because() } [Fact] - public void should_call_service_oudated_run() + public void should_call_service_outdated_run() { packageService.Verify(c => c.outdated_run(configuration), Times.Once); } diff --git a/src/chocolatey.tests/infrastructure.app/commands/ChocolateyPinCommandSpecs.cs b/src/chocolatey.tests/infrastructure.app/commands/ChocolateyPinCommandSpecs.cs index b1a2c6ab9d..eb98379abc 100644 --- a/src/chocolatey.tests/infrastructure.app/commands/ChocolateyPinCommandSpecs.cs +++ b/src/chocolatey.tests/infrastructure.app/commands/ChocolateyPinCommandSpecs.cs @@ -157,7 +157,7 @@ public void should_throw_when_more_than_one_unparsed_arg_is_passed() reset(); unparsedArgs.Add("wtf"); unparsedArgs.Add("bbq"); - var errorred = false; + var errored = false; Exception error = null; try @@ -166,11 +166,11 @@ public void should_throw_when_more_than_one_unparsed_arg_is_passed() } catch (Exception ex) { - errorred = true; + errored = true; error = ex; } - errorred.ShouldBeTrue(); + errored.ShouldBeTrue(); error.ShouldNotBeNull(); error.ShouldBeType(); error.Message.ShouldContain("A single pin command must be listed"); @@ -277,7 +277,7 @@ public void should_throw_when_command_is_not_list_and_name_is_not_set() { configuration.PinCommand.Command = PinCommandType.add; configuration.PinCommand.Name = ""; - var errorred = false; + var errored = false; Exception error = null; try @@ -286,11 +286,11 @@ public void should_throw_when_command_is_not_list_and_name_is_not_set() } catch (Exception ex) { - errorred = true; + errored = true; error = ex; } - errorred.ShouldBeTrue(); + errored.ShouldBeTrue(); error.ShouldNotBeNull(); error.ShouldBeType(); error.Message.ShouldEqual("When specifying the subcommand '{0}', you must also specify --name.".format_with(configuration.PinCommand.Command.to_string())); diff --git a/src/chocolatey.tests/infrastructure.app/commands/ChocolateyPushCommandSpecs.cs b/src/chocolatey.tests/infrastructure.app/commands/ChocolateyPushCommandSpecs.cs index c64f97c11b..87988a9248 100644 --- a/src/chocolatey.tests/infrastructure.app/commands/ChocolateyPushCommandSpecs.cs +++ b/src/chocolatey.tests/infrastructure.app/commands/ChocolateyPushCommandSpecs.cs @@ -230,7 +230,7 @@ public override void Because() public void should_throw_when_source_is_not_set() { configuration.Sources = ""; - var errorred = false; + var errored = false; Exception error = null; try @@ -239,11 +239,11 @@ public void should_throw_when_source_is_not_set() } catch (Exception ex) { - errorred = true; + errored = true; error = ex; } - errorred.ShouldBeTrue(); + errored.ShouldBeTrue(); error.ShouldNotBeNull(); error.ShouldBeType(); error.Message.ShouldContain("Source is required."); @@ -254,7 +254,7 @@ public void should_throw_when_apiKey_has_not_been_set_or_determined_for_a_https_ { configuration.Sources = "https://somewhere/out/there"; configuration.PushCommand.Key = ""; - var errorred = false; + var errored = false; Exception error = null; try @@ -263,11 +263,11 @@ public void should_throw_when_apiKey_has_not_been_set_or_determined_for_a_https_ } catch (Exception ex) { - errorred = true; + errored = true; error = ex; } - errorred.ShouldBeTrue(); + errored.ShouldBeTrue(); error.ShouldNotBeNull(); error.ShouldBeType(); error.Message.ShouldContain("ApiKey was not found"); @@ -303,7 +303,7 @@ public void should_throw_when_source_is_http_and_not_secure() configuration.Sources = "http://somewhere/out/there"; configuration.PushCommand.Key = "bob"; configuration.Force = false; - var errorred = false; + var errored = false; Exception error = null; try @@ -312,11 +312,11 @@ public void should_throw_when_source_is_http_and_not_secure() } catch (Exception ex) { - errorred = true; + errored = true; error = ex; } - errorred.ShouldBeTrue(); + errored.ShouldBeTrue(); error.ShouldNotBeNull(); error.ShouldBeType(); error.Message.ShouldContain("WARNING! The specified source '{0}' is not secure".format_with(configuration.Sources)); diff --git a/src/chocolatey.tests/infrastructure.app/commands/ChocolateySourceCommandSpecs.cs b/src/chocolatey.tests/infrastructure.app/commands/ChocolateySourceCommandSpecs.cs index b4d00c03d7..d6eab68b66 100644 --- a/src/chocolatey.tests/infrastructure.app/commands/ChocolateySourceCommandSpecs.cs +++ b/src/chocolatey.tests/infrastructure.app/commands/ChocolateySourceCommandSpecs.cs @@ -168,7 +168,7 @@ public void should_throw_when_more_than_one_unparsed_arg_is_passed() reset(); unparsedArgs.Add("wtf"); unparsedArgs.Add("bbq"); - var errorred = false; + var errored = false; Exception error = null; try @@ -177,11 +177,11 @@ public void should_throw_when_more_than_one_unparsed_arg_is_passed() } catch (Exception ex) { - errorred = true; + errored = true; error = ex; } - errorred.ShouldBeTrue(); + errored.ShouldBeTrue(); error.ShouldNotBeNull(); error.ShouldBeType(); error.Message.ShouldContain("A single sources command must be listed"); @@ -297,7 +297,7 @@ private void verify_exception_thrown_on_command(string expectedMessage) { configuration.SourceCommand.Command = SourceCommandType.add; - var errorred = false; + var errored = false; Exception error = null; try @@ -306,11 +306,11 @@ private void verify_exception_thrown_on_command(string expectedMessage) } catch (Exception ex) { - errorred = true; + errored = true; error = ex; } - errorred.ShouldBeTrue(); + errored.ShouldBeTrue(); error.ShouldNotBeNull(); error.ShouldBeType(); var commandName = configuration.SourceCommand.Command.to_string(); diff --git a/src/chocolatey.tests/infrastructure.app/commands/ChocolateyUninstallCommandSpecs.cs b/src/chocolatey.tests/infrastructure.app/commands/ChocolateyUninstallCommandSpecs.cs index b5757f6428..8a3433c2c3 100644 --- a/src/chocolatey.tests/infrastructure.app/commands/ChocolateyUninstallCommandSpecs.cs +++ b/src/chocolatey.tests/infrastructure.app/commands/ChocolateyUninstallCommandSpecs.cs @@ -204,7 +204,7 @@ public override void Because() public void should_throw_when_packagenames_is_not_set() { configuration.PackageNames = ""; - var errorred = false; + var errored = false; Exception error = null; try @@ -213,11 +213,11 @@ public void should_throw_when_packagenames_is_not_set() } catch (Exception ex) { - errorred = true; + errored = true; error = ex; } - errorred.ShouldBeTrue(); + errored.ShouldBeTrue(); error.ShouldNotBeNull(); error.ShouldBeType(); } diff --git a/src/chocolatey.tests/infrastructure.app/commands/ChocolateyUpgradeCommandSpecs.cs b/src/chocolatey.tests/infrastructure.app/commands/ChocolateyUpgradeCommandSpecs.cs index a18e94412b..2b179381e6 100644 --- a/src/chocolatey.tests/infrastructure.app/commands/ChocolateyUpgradeCommandSpecs.cs +++ b/src/chocolatey.tests/infrastructure.app/commands/ChocolateyUpgradeCommandSpecs.cs @@ -252,7 +252,7 @@ public override void Because() public void should_throw_when_packagenames_is_not_set() { configuration.PackageNames = ""; - var errorred = false; + var errored = false; Exception error = null; try @@ -261,11 +261,11 @@ public void should_throw_when_packagenames_is_not_set() } catch (Exception ex) { - errorred = true; + errored = true; error = ex; } - errorred.ShouldBeTrue(); + errored.ShouldBeTrue(); error.ShouldNotBeNull(); error.ShouldBeType(); } diff --git a/src/chocolatey.tests/infrastructure/cryptography/CrytpoHashProviderSpecs.cs b/src/chocolatey.tests/infrastructure/cryptography/CryptoHashProviderSpecs.cs similarity index 92% rename from src/chocolatey.tests/infrastructure/cryptography/CrytpoHashProviderSpecs.cs rename to src/chocolatey.tests/infrastructure/cryptography/CryptoHashProviderSpecs.cs index fa29d563dc..003248166c 100644 --- a/src/chocolatey.tests/infrastructure/cryptography/CrytpoHashProviderSpecs.cs +++ b/src/chocolatey.tests/infrastructure/cryptography/CryptoHashProviderSpecs.cs @@ -26,9 +26,9 @@ namespace chocolatey.tests.infrastructure.cryptography using Moq; using Should; - public class CrytpoHashProviderSpecs + public class CryptoHashProviderSpecs { - public abstract class CrytpoHashProviderSpecsBase : TinySpec + public abstract class CryptoHashProviderSpecsBase : TinySpec { protected CryptoHashProvider Provider; protected Mock FileSystem = new Mock(); @@ -39,7 +39,7 @@ public override void Context() } } - public class when_HashProvider_provides_a_hash : CrytpoHashProviderSpecsBase + public class when_HashProvider_provides_a_hash : CryptoHashProviderSpecsBase { private string result; private readonly string filePath = "c:\\path\\does\\not\\matter.txt"; @@ -66,7 +66,7 @@ public void should_provide_the_correct_hash_based_on_a_checksum() } } - public class when_HashProvider_attempts_to_provide_a_hash_for_a_file_over_2GB : CrytpoHashProviderSpecsBase + public class when_HashProvider_attempts_to_provide_a_hash_for_a_file_over_2GB : CryptoHashProviderSpecsBase { private string result; private readonly string filePath = "c:\\path\\does\\not\\matter.txt"; diff --git a/src/chocolatey/GetChocolatey.cs b/src/chocolatey/GetChocolatey.cs index a847f4eaa8..9dc45d49dd 100644 --- a/src/chocolatey/GetChocolatey.cs +++ b/src/chocolatey/GetChocolatey.cs @@ -277,7 +277,7 @@ public GetChocolatey RegisterContainerComponent(Lifesty /// Registers a container component. Does not require a dependency on Simple Injector. /// Will override existing component if registered. /// - /// The type of the ervice. + /// The type of the service. /// The implementation creator. /// This instance /// diff --git a/src/chocolatey/infrastructure.app/services/ChocolateyPackageService.cs b/src/chocolatey/infrastructure.app/services/ChocolateyPackageService.cs index 8ee3274d08..e773cef9cc 100644 --- a/src/chocolatey/infrastructure.app/services/ChocolateyPackageService.cs +++ b/src/chocolatey/infrastructure.app/services/ChocolateyPackageService.cs @@ -485,7 +485,7 @@ public virtual void handle_package_result(PackageResult packageResult, Chocolate private void create_ignore_files_for_executables(string installLocation, bool is64Bit) { - // If we are using a 64 bit architecure, we want to ignore exe's targetting x86 + // If we are using a 64 bit architecture, we want to ignore exe's targeting x86 // This is done by adding a .ignore file into the package folder for each exe to ignore var exeFiles32Bit = (_fileSystem.directory_exists(_fileSystem.combine_paths(installLocation, "tools\\x86")) ? _fileSystem.get_files(_fileSystem.combine_paths(installLocation, "tools\\x86"), pattern: "*.exe", option: SearchOption.AllDirectories) : new List()).ToArray(); var exeFiles64Bit = (_fileSystem.directory_exists(_fileSystem.combine_paths(installLocation, "tools\\x64")) ? _fileSystem.get_files(_fileSystem.combine_paths(installLocation, "tools\\x64"), pattern: "*.exe", option: SearchOption.AllDirectories) : new List()).ToArray(); diff --git a/src/chocolatey/infrastructure.app/services/IFilesService.cs b/src/chocolatey/infrastructure.app/services/IFilesService.cs index 193aaa2fbb..6dea6ac8b1 100644 --- a/src/chocolatey/infrastructure.app/services/IFilesService.cs +++ b/src/chocolatey/infrastructure.app/services/IFilesService.cs @@ -33,7 +33,7 @@ public interface IFilesService PackageFiles read_from_file(string filepath); /// - /// Saves the files snapshot to the specifed file path. + /// Saves the files snapshot to the specified file path. /// /// The snapshot. /// The file path. diff --git a/src/chocolatey/infrastructure.app/services/PythonService.cs b/src/chocolatey/infrastructure.app/services/PythonService.cs index d7aa372a43..972354c10c 100644 --- a/src/chocolatey/infrastructure.app/services/PythonService.cs +++ b/src/chocolatey/infrastructure.app/services/PythonService.cs @@ -272,7 +272,7 @@ public string build_args(ChocolateyConfiguration config, IDictionary - /// Evaluates registry keys and updates the snapshop with items + /// Evaluates registry keys and updates the snapshot with items /// /// The key. /// The snapshot. diff --git a/src/chocolatey/infrastructure.app/templates/ChocolateyInstallTemplate.cs b/src/chocolatey/infrastructure.app/templates/ChocolateyInstallTemplate.cs index 0581b778a9..8be7a5687b 100644 --- a/src/chocolatey/infrastructure.app/templates/ChocolateyInstallTemplate.cs +++ b/src/chocolatey/infrastructure.app/templates/ChocolateyInstallTemplate.cs @@ -112,7 +112,7 @@ public class ChocolateyInstallTemplate #Install-ChocolateyInstallPackage $packageName $fileType $silentArgs '_FULLFILEPATH_' -validExitCodes $validExitCodes ## Unzips a file to the specified location - auto overwrites existing content -## - https://docs.chocolatey.org/en-us/create/functions/get-chocolateyunzipp +## - https://docs.chocolatey.org/en-us/create/functions/get-chocolateyunzip #Get-ChocolateyUnzip ""FULL_LOCATION_TO_ZIP.zip"" $toolsDir ## Runs processes asserting UAC, will assert administrative rights - used by Install-ChocolateyInstallPackage @@ -148,7 +148,7 @@ public class ChocolateyInstallTemplate ## - https://docs.chocolatey.org/en-us/create/functions/install-chocolateyfileassociation #Install-ChocolateyFileAssociation -## Adding a shim when not automatically found - Cocolatey automatically shims exe files found in package directory. +## Adding a shim when not automatically found - Chocolatey automatically shims exe files found in package directory. ## - https://docs.chocolatey.org/en-us/create/functions/install-binfile ## - https://docs.chocolatey.org/en-us/create/create-packages#how-do-i-exclude-executables-from-getting-shims #Install-BinFile diff --git a/src/chocolatey/infrastructure.app/templates/ChocolateyReadMeTemplate.cs b/src/chocolatey/infrastructure.app/templates/ChocolateyReadMeTemplate.cs index 6f553f9595..8922ac353f 100644 --- a/src/chocolatey/infrastructure.app/templates/ChocolateyReadMeTemplate.cs +++ b/src/chocolatey/infrastructure.app/templates/ChocolateyReadMeTemplate.cs @@ -118,7 +118,7 @@ Chocolatey makes a number of environment variables available (You can access any #### Business Edition Variables * ChocolateyInstallArgumentsSensitive - Encrypted arguments passed from command line `--install-arguments-sensitive` that are not logged anywhere. (0.10.1+ and licensed editions 1.6.0+) - * ChocolateyPackageParametersSensitive - Package parameters passed from command line `--package-parameters-senstivite` that are not logged anywhere. (0.10.1+ and licensed editions 1.6.0+) + * ChocolateyPackageParametersSensitive - Package parameters passed from command line `--package-parameters-sensitive` that are not logged anywhere. (0.10.1+ and licensed editions 1.6.0+) * ChocolateyLicensedVersion - What version is the licensed edition on? * ChocolateyLicenseType - What edition / type of the licensed edition is installed? * USER_CONTEXT - The original user context - different when self-service is used (Licensed v1.10.0+) diff --git a/src/chocolatey/infrastructure/extractors/AssemblyFileExtractor.cs b/src/chocolatey/infrastructure/extractors/AssemblyFileExtractor.cs index a6d3111856..e1121b1cd4 100644 --- a/src/chocolatey/infrastructure/extractors/AssemblyFileExtractor.cs +++ b/src/chocolatey/infrastructure/extractors/AssemblyFileExtractor.cs @@ -66,8 +66,8 @@ public static void extract_text_file_from_assembly(IFileSystem fileSystem, IAsse /// /// if set to true [overwrite existing]. /// - /// Throw an error if there are issues - public static void extract_binary_file_from_assembly(IFileSystem fileSystem, IAssembly assembly, string manifestLocation, string filePath, bool overwriteExisting = false, bool throwEror = true) + /// Throw an error if there are issues + public static void extract_binary_file_from_assembly(IFileSystem fileSystem, IAssembly assembly, string manifestLocation, string filePath, bool overwriteExisting = false, bool throwError = true) { if (overwriteExisting || !fileSystem.file_exists(filePath)) { @@ -78,10 +78,10 @@ public static void extract_binary_file_from_assembly(IFileSystem fileSystem, IAs fileSystem.write_file(filePath, () => assembly.get_manifest_stream(manifestLocation)); }, errorMessage:"Unable to extract binary", - throwError: throwEror, + throwError: throwError, logWarningInsteadOfError: false, - logDebugInsteadOfError: !throwEror, - isSilent: !throwEror); + logDebugInsteadOfError: !throwError, + isSilent: !throwError); } } diff --git a/src/chocolatey/infrastructure/filesystem/IFileSystem.cs b/src/chocolatey/infrastructure/filesystem/IFileSystem.cs index 9fdba65729..ee3fb6049b 100644 --- a/src/chocolatey/infrastructure/filesystem/IFileSystem.cs +++ b/src/chocolatey/infrastructure/filesystem/IFileSystem.cs @@ -248,7 +248,7 @@ public interface IFileSystem FileStream open_file_readonly(string filePath); /// - /// Opens a file exlusively + /// Opens a file exclusively /// /// Path to the file name /// A file stream object for use after accessing the file @@ -273,7 +273,7 @@ public interface IFileSystem /// Writes a stream to a specified file path. /// /// The file path. - /// A defferred function of getting the stream + /// A deferred function of getting the stream void write_file(string filePath, Func getStream); #endregion diff --git a/src/chocolatey/infrastructure/synchronization/GlobalMutex.cs b/src/chocolatey/infrastructure/synchronization/GlobalMutex.cs index bb1711e94d..a78ca21f15 100644 --- a/src/chocolatey/infrastructure/synchronization/GlobalMutex.cs +++ b/src/chocolatey/infrastructure/synchronization/GlobalMutex.cs @@ -93,7 +93,7 @@ public static void enter(Action action, int timeout) } /// - /// Enters the Global Mutext + /// Enters the Global Mutex /// /// The return type /// The function to perform. diff --git a/src/chocolatey/infrastructure/xml/XmlCData.cs b/src/chocolatey/infrastructure/xml/XmlCData.cs index eee1bb509b..08fcab75be 100644 --- a/src/chocolatey/infrastructure/xml/XmlCData.cs +++ b/src/chocolatey/infrastructure/xml/XmlCData.cs @@ -42,7 +42,7 @@ public static implicit operator XmlCData(string value) } /// - /// Allow direct assigment to string + /// Allow direct assignment to string /// string str = cdata; /// ///