@@ -48,6 +48,7 @@ if ($restartingInstance) {
4848 if (" $databaseInstance " -ne " "
4949 $databaseServerInstance += " \$databaseInstance "
5050 }
51+ Write-Host " Using database server $databaseServerInstance "
5152
5253 if (! $multitenant ) {
5354 New-NAVDatabase - DatabaseServer $databaseServer `
@@ -79,26 +80,28 @@ if ($restartingInstance) {
7980 Remove-NAVApplication - DatabaseServer $DatabaseServer - DatabaseInstance $DatabaseInstance - DatabaseName " tenant" - Force | Out-Null
8081 }
8182
82- } elseif (" $appBacpac " -ne " " -and " $tenantBacpac " -ne " "
83+ } elseif (" $appBacpac " -ne " "
8384
8485 # appBacpac and tenantBacpac specified - restore and use
8586
8687 $dbName = " app"
8788 $appBacpac , $tenantBacpac | % {
88- if ($_.StartsWith (" https://" -or $_.StartsWith (" http://"
89- {
90- $databaseFile = (Join-Path $runPath " ${dbName} .bacpac"
91- Write-Host " Downloading ${dbName} .bacpac"
92- (New-Object System.Net.WebClient).DownloadFile($_ , $databaseFile )
93- } else {
94- if (! (Test-Path - Path $_ - PathType Leaf)) {
95- Write-Error " ERROR: Database Backup File not found."
96- Write-Error " The file must be uploaded to the container or available on a share."
97- exit 1
89+ if ($_ ) {
90+ if ($_.StartsWith (" https://" -or $_.StartsWith (" http://"
91+ {
92+ $databaseFile = (Join-Path $runPath " ${dbName} .bacpac"
93+ Write-Host " Downloading ${dbName} .bacpac"
94+ (New-Object System.Net.WebClient).DownloadFile($_ , $databaseFile )
95+ } else {
96+ if (! (Test-Path - Path $_ - PathType Leaf)) {
97+ Write-Error " ERROR: Database Backup File not found."
98+ Write-Error " The file must be uploaded to the container or available on a share."
99+ exit 1
100+ }
101+ $databaseFile = $_
98102 }
99- $databaseFile = $_
103+ Restore-BacpacWithRetry - Bacpac $databaseFile - DatabaseName $dbName
100104 }
101- Restore-BacpacWithRetry - Bacpac $databaseFile - DatabaseName $dbName
102105 $dbName = " tenant"
103106 }
104107
0 commit comments