sign installer pre-exec checks

cloudflightio · Feb 16, 2022 · 440c950 · 440c950
1 parent 0047767
commit 440c950
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/msi/SignInstaller.ps1 b/msi/SignInstaller.ps1
@@ -1,9 +1,9 @@
 $ValidationErrors = @()
-if (-not (Test-Path env:PFX_THUMBPRINT)) { $ValidationErrors += @("PFX_THUMBPRINT envvar not set") }
-if (-not (Test-Path env:PFX_PASSPHRASE)) { $ValidationErrors += @("PFX_PASSPHRASE envvar not set") }
+if (-not (Test-Path env:PFX_THUMBPRINT) -or (-not $env:PFX_THUMBPRINT)) { $ValidationErrors += @("PFX_THUMBPRINT envvar not set") }
+if (-not (Test-Path env:PFX_PASSPHRASE) -or (-not $env:PFX_THUMBPRINT)) { $ValidationErrors += @("PFX_PASSPHRASE envvar not set") }
 if ($ValidationErrors.Count -gt 0) { 
-    Write-Warning "Validation Failed!`n$($ValidationErrors -join "`n")"
-    exit 0
+    Write-Warning "`n$($ValidationErrors -join "`n")"
+    throw "Env-Vars not set!"
 }
 
 $msbuild = &"${env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer\vswhere.exe" -latest -prerelease -products * -requires Microsoft.Component.MSBuild -find MSBuild\**\Bin\MSBuild.exe