- Resolves issue with Request-UnitySetupInstaller not completing after all files finished downloading.

Ziugy · Ziugy · commit 9cc8b4b19af0 · 2019-01-10T08:14:44.000-08:00
diff --git a/UnitySetup/UnitySetup.psm1 b/UnitySetup/UnitySetup.psm1
@@ -665,10 +665,11 @@ function Request-UnitySetupInstaller {
                 }
             }
 
+            # Showing progress of all file downloads
             $totalDownloads = $global:downloadData.Count
+            do {
+                $installersDownloaded = 0
 
-            # Showing progress of all file downloads
-            while ($global:downloadData.Count -gt 0) {
                 $global:downloadData.Keys | ForEach-Object {
                     $installerFileName = $_
                     $data = $global:downloadData[$installerFileName]
@@ -720,7 +721,7 @@ function Request-UnitySetupInstaller {
                         -PercentComplete $progress `
                         -Id $data.downloadIndex
                 }
-            }
+            } while ($installersDownloaded -lt $totalDownloads)
         }
         finally {
             # If the script is stopped, e.g. Ctrl+C, we want to cancel any remaining downloads

Original file line number	Diff line number	Diff line change
`@@ -665,10 +665,11 @@ function Request-UnitySetupInstaller {`
`665`	`665`	`}`
`666`	`666`	`}`
`667`	`667`
	`668`	`+ # Showing progress of all file downloads`
`668`	`669`	`$totalDownloads = $global:downloadData.Count`
	`670`	`+ do {`
	`671`	`+ $installersDownloaded = 0`
`669`	`672`
`670`		`- # Showing progress of all file downloads`
`671`		`- while ($global:downloadData.Count -gt 0) {`
`672`	`673`	`$global:downloadData.Keys \| ForEach-Object {`
`673`	`674`	`$installerFileName = $_`
`674`	`675`	`$data = $global:downloadData[$installerFileName]`
`@@ -720,7 +721,7 @@ function Request-UnitySetupInstaller {`
`720`	`721`	-PercentComplete $progress `
`721`	`722`	`-Id $data.downloadIndex`
`722`	`723`	`}`
`723`		`- }`
	`724`	`+ } while ($installersDownloaded -lt $totalDownloads)`
`724`	`725`	`}`
`725`	`726`	`finally {`
`726`	`727`	`# If the script is stopped, e.g. Ctrl+C, we want to cancel any remaining downloads`