Updates for folder changes

Author: jwallaceAtCm

Add-VstsAgent.ps1

@@ -32,7 +32,11 @@ param(
 [string] $AdminUser,
 [Parameter(Mandatory)]
 [string] $AdminUserPwd,
-[string] $AgentPool = "AgentPool"
+[Parameter(Mandatory)]
+[string] $AgentPool,
+[Parameter(Mandatory)]
+[ValidateScript({Test-Path $_ -PathType Container})]
+[string] $DownloadFolder
 )
 
 Set-StrictMode -Version Latest
@@ -48,7 +52,7 @@ Logit -indent "PAT $($PAT[0]+"*"*$PAT.Length)"
 Logit -indent "AdminUserPwd $($AdminUserPwd[0]+"*"*$AdminUserPwd.Length)"
 Logit -indent "Folder is $Folder"
 
-$fname = (Get-Item (Join-Path $PSScriptRoot "vsts-agent*.zip")).FullName
+$fname = (Get-Item (Join-Path $DownloadFolder "vsts-agent*.zip")).FullName
 Logit -indent "fname is $fname"
 
 Expand-Archive -Path $fname -DestinationPath $Folder -Force

Initialize-BuildVM.ps1

@@ -107,17 +107,14 @@ Set-Location $Folder
 
 if ( Test-Path .\BootcampScripts )
 {
-    LogIt ".\BootcampScripts exists, pulling"
-    Set-Location .\BootcampScripts
-    git pull 2>&1
-}
-else
-{
-    LogIt ".\BootcampScripts does not exist, cloning"
-    git clone https://github.com/ClearMeasure/BootcampScripts.git 2>&1
-    Set-Location .\BootcampScripts
+    LogIt ".\BootcampScripts exists, removing it"
+    Remove-Item .\BootcampScripts -Recurse -Force -ErrorAction Ignore
 }
 
+LogIt "Cloning BootcampScripts"
+git clone https://github.com/ClearMeasure/BootcampScripts.git 2>&1
+Set-Location .\BootcampScripts
+
 $ErrorActionPreference = "Stop"
 
 try {
@@ -128,7 +125,7 @@ try {
 
     if ( !$SkipVsts )
     {
-        .\Add-VstsAgent.ps1 -LogFile $logFile -AccountUrl $AccountUrl -PAT $PAT -AdminUser $AdminUserName -AdminUserPwd $AdminUserPwd -AgentPool $AgentPool
+        .\Add-VstsAgent.ps1 -LogFile $logFile -AccountUrl $AccountUrl -PAT $PAT -AdminUser $AdminUserName -AdminUserPwd $AdminUserPwd -AgentPool $AgentPool -DownloadFolder $PSScriptRoot
     }
 
     if ( !$SkipSql )