From d1ed5029b5e3fb2ba27662dd1751b5968155e86b Mon Sep 17 00:00:00 2001 From: Maksim Petrov Date: Mon, 30 Dec 2019 14:51:09 +0300 Subject: [PATCH] Toolcache: fix typos in windows toolcache provisioners --- images/win/scripts/Installers/Download-ToolCache.ps1 | 3 +-- images/win/scripts/Installers/Validate-ToolCache.ps1 | 6 +++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/images/win/scripts/Installers/Download-ToolCache.ps1 b/images/win/scripts/Installers/Download-ToolCache.ps1 index eef9f7d96..b031a827e 100644 --- a/images/win/scripts/Installers/Download-ToolCache.ps1 +++ b/images/win/scripts/Installers/Download-ToolCache.ps1 @@ -29,8 +29,7 @@ $ToolsDirectory = $Dest + $Path $env:AGENT_TOOLSDIRECTORY = $ToolsDirectory setx AGENT_TOOLSDIRECTORY $ToolsDirectory /M -# Install tools form NPM - +# Install HostedToolCache tools via NPM $ToolVersionsFileContent = Get-Content -Path "$env:ROOT_FOLDER/toolcache.json" -Raw $ToolVersions = ConvertFrom-Json -InputObject $ToolVersionsFileContent diff --git a/images/win/scripts/Installers/Validate-ToolCache.ps1 b/images/win/scripts/Installers/Validate-ToolCache.ps1 index df61f6f6c..cde063511 100644 --- a/images/win/scripts/Installers/Validate-ToolCache.ps1 +++ b/images/win/scripts/Installers/Validate-ToolCache.ps1 @@ -37,14 +37,14 @@ function ToolcacheTest { if (Test-Path "$env:AGENT_TOOLSDIRECTORY\$SoftwareName") { $description = "" - [array]$instaledVersions = GetChildFolders -Path "$env:AGENT_TOOLSDIRECTORY\$SoftwareName" - if ($instaledVersions.count -gt 0){ + [array]$installedVersions = GetChildFolders -Path "$env:AGENT_TOOLSDIRECTORY\$SoftwareName" + if ($installedVersions.count -gt 0){ $softwarePackages = $packages | Where-Object { $_.ToolName -eq $SoftwareName } foreach($softwarePackage in $softwarePackages) { foreach ($version in $softwarePackage.Versions) { - $foundVersion = $instaledVersions | where { $_.StartsWith($version) } + $foundVersion = $installedVersions | where { $_.StartsWith($version) } if ($foundVersion -ne $null){