From 761558f6129349680b78fb7f3b45c112aae28a93 Mon Sep 17 00:00:00 2001 From: AnyOldName3 Date: Tue, 19 May 2020 01:32:08 +0100 Subject: [PATCH 1/2] Remove test data A dummy command was used to check the script would fail if a command was missing. Not being a real command, it always made the script fail as a command was missing. --- CI/ActivateMSVC.ps1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CI/ActivateMSVC.ps1 b/CI/ActivateMSVC.ps1 index ca78ef5886..ae73acfe18 100644 --- a/CI/ActivateMSVC.ps1 +++ b/CI/ActivateMSVC.ps1 @@ -4,8 +4,8 @@ } $MissingTools = $false -$tools = "cl", "link", "rc", "mt", "awooga" -$descriptions = "MSVC Compiler", "MSVC Linker", "MS Windows Resource Compiler", "MS Windows Manifest Tool", "A made up command" +$tools = "cl", "link", "rc", "mt" +$descriptions = "MSVC Compiler", "MSVC Linker", "MS Windows Resource Compiler", "MS Windows Manifest Tool" for ($i = 0; $i -lt $tools.Length; $i++) { $present = $true try { From 079be5d485083d3646ec8e53ad7cbeb09cbc7b2a Mon Sep 17 00:00:00 2001 From: AnyOldName3 Date: Tue, 19 May 2020 17:50:18 +0100 Subject: [PATCH 2/2] Remove annoying warning --- CI/ActivateMSVC.ps1 | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/CI/ActivateMSVC.ps1 b/CI/ActivateMSVC.ps1 index ae73acfe18..a04a23a937 100644 --- a/CI/ActivateMSVC.ps1 +++ b/CI/ActivateMSVC.ps1 @@ -1,6 +1,8 @@ & "${env:COMSPEC}" /c ActivateMSVC.bat "&&" set | ForEach-Object { - $name, $value = $_ -split '=', 2 - Set-Content env:\"$name" $value + if ($_.Contains("=")) { + $name, $value = $_ -split '=', 2 + Set-Content env:\"$name" $value + } } $MissingTools = $false