adjust paths again

jacdavi · jacdavi · commit 3639fe3a4190 · 2025-09-29T16:38:08.000-07:00
diff --git a/m365/image/run_container.ps1 b/m365/image/run_container.ps1
@@ -92,11 +92,11 @@ Foreach ($tenantConfig in $(Get-ChildItem 'input\')) {
         Write-Output "  Starting Upload"
         $DatePath = Get-Date -Format "yyyy/MM/dd"
         if ("true" -eq $Env:OUTPUT_ALL_FILES) {
-            $InPath = ".\reports\$($org)\*"
+            $InPath = "$($ResultsFile.DirectoryName)\*"
             $OutPath = "$($Env:REPORT_OUTPUT)/$($DatePath)/$($org)-$([int]$(Get-Date).TimeOfDay.TotalSeconds)"
         }
         else {
-            $ResultsFile.FullName
+            $InPath = $ResultsFile.FullName
             $OutPath = "$($Env:REPORT_OUTPUT)/$($DatePath)/$($ResultsFile.Name)"
         }
         if ($null -ne $Env:REPORT_SAS) {

Original file line number	Diff line number	Diff line change
`@@ -92,11 +92,11 @@ Foreach ($tenantConfig in $(Get-ChildItem 'input\')) {`
`92`	`92`	`Write-Output " Starting Upload"`
`93`	`93`	`$DatePath = Get-Date -Format "yyyy/MM/dd"`
`94`	`94`	`if ("true" -eq $Env:OUTPUT_ALL_FILES) {`
`95`		`- $InPath = ".\reports\$($org)\*"`
	`95`	`+ $InPath = "$($ResultsFile.DirectoryName)\*"`
`96`	`96`	`$OutPath = "$($Env:REPORT_OUTPUT)/$($DatePath)/$($org)-$([int]$(Get-Date).TimeOfDay.TotalSeconds)"`
`97`	`97`	`}`
`98`	`98`	`else {`
`99`		`- $ResultsFile.FullName`
	`99`	`+ $InPath = $ResultsFile.FullName`
`100`	`100`	`$OutPath = "$($Env:REPORT_OUTPUT)/$($DatePath)/$($ResultsFile.Name)"`
`101`	`101`	`}`
`102`	`102`	`if ($null -ne $Env:REPORT_SAS) {`