From 52b67da7854c776a89c73356fb182a28d837b1ad Mon Sep 17 00:00:00 2001 From: Tobias Chen Date: Mon, 12 Jul 2021 15:54:04 +0200 Subject: [PATCH] [Ubuntu] Remove hardcoded toolsToInstall from script (#3701) --- images/linux/scripts/installers/Install-Toolset.ps1 | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/images/linux/scripts/installers/Install-Toolset.ps1 b/images/linux/scripts/installers/Install-Toolset.ps1 index 313591598..e60f5a2b2 100644 --- a/images/linux/scripts/installers/Install-Toolset.ps1 +++ b/images/linux/scripts/installers/Install-Toolset.ps1 @@ -28,9 +28,8 @@ $ErrorActionPreference = "Stop" # Get toolset content $toolset = Get-Content -Path "$env:INSTALLER_SCRIPT_FOLDER/toolset.json" -Raw -$toolsToInstall = @("Python", "Node", "Go") -$tools = ConvertFrom-Json -InputObject $toolset | Select-Object -ExpandProperty toolcache | Where-Object {$ToolsToInstall -contains $_.Name} +$tools = ConvertFrom-Json -InputObject $toolset | Select-Object -ExpandProperty toolcache | Where-Object {$_.url -ne $null } foreach ($tool in $tools) { # Get versions manifest for current tool @@ -51,8 +50,5 @@ foreach ($tool in $tools) { exit 1 } } + chown -R "$($env:SUDO_USER):$($env:SUDO_USER)" /opt/hostedtoolcache/$tool } - -chown -R "$($env:SUDO_USER):$($env:SUDO_USER)" /opt/hostedtoolcache/Python -chown -R "$($env:SUDO_USER):$($env:SUDO_USER)" /opt/hostedtoolcache/node -chown -R "$($env:SUDO_USER):$($env:SUDO_USER)" /opt/hostedtoolcache/go \ No newline at end of file