From fa9d334348b8d415436797e8d6ca1f592257bc43 Mon Sep 17 00:00:00 2001
From: dovholuknf <46322585+dovholuknf@users.noreply.github.com>
Date: Wed, 18 Sep 2024 15:57:20 -0400
Subject: [PATCH] build related changes

---
 Installer/build.ps1    | 19 ++++++++++---------
 build-test-release.ps1 |  2 --
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/Installer/build.ps1 b/Installer/build.ps1
index a03f0f9d5..f42a65feb 100644
--- a/Installer/build.ps1
+++ b/Installer/build.ps1
@@ -87,13 +87,14 @@ Pop-Location
 
 if ($version -eq "") {
     $version=(Get-Content -Path ${checkoutRoot}\version)
-} else {
-    echo "VERSION set to $version"
 }
+
+echo "Building VERSION $version"
+
 if($null -ne $env:ZITI_DESKTOP_EDGE_VERSION) {
-    echo "ZITI_DESKTOP_EDGE_VERSION is set. Using that: ${env:ZITI_DESKTOP_EDGE_VERSION} instead of version found in file ${installerVersion}"
-    $installerVersion=$env:ZITI_DESKTOP_EDGE_VERSION
-    echo "Version set to: ${installerVersion}"
+    echo "ZITI_DESKTOP_EDGE_VERSION is set. Using that: ${env:ZITI_DESKTOP_EDGE_VERSION} instead of version found in file ${version}"
+    $version=$env:ZITI_DESKTOP_EDGE_VERSION
+    echo "Version set to: ${version}"
 }
 $action = '/SetVersion'
 
@@ -115,7 +116,7 @@ if($gituser -eq "ziti-ci") {
 }
 
 $outputPath="${scriptPath}\Output"
-$exeName="Ziti Desktop Edge Client-${installerVersion}.exe"
+$exeName="Ziti Desktop Edge Client-${version}.exe"
 $exeAbsPath="${outputPath}\${exeName}"
 
 if($null -eq $env:AWS_KEY_ID) {
@@ -130,14 +131,14 @@ if($null -eq $env:OPENZITI_P12_PASS_2024) {
     echo ""
 } else {
     echo "adding additional signature to executable with openziti.org signing certificate"
-    echo "Using ${SIGNTOOL} to sign executable with the additional OpenZiti signature"
+    echo "Using ${SIGNTOOL} to sign executable with the additional OpenZiti signature: ${exeAbsPath}"
     & "$SIGNTOOL" sign /f "${scriptPath}\openziti_2024.p12" /p "${env:OPENZITI_P12_PASS_2024}" /tr http://ts.ssl.com /fd sha512 /td sha512 /as "${exeAbsPath}"
 }
 
-(Get-FileHash "${exeAbsPath}").Hash > "${scriptPath}\Output\Ziti Desktop Edge Client-${installerVersion}.exe.sha256"
+(Get-FileHash "${exeAbsPath}").Hash > "${scriptPath}\Output\Ziti Desktop Edge Client-${version}.exe.sha256"
 echo "========================== build.ps1 completed =========================="
 
-$outputPath = "${scriptPath}\Output\Ziti Desktop Edge Client-${installerVersion}.exe.json"
+$outputPath = "${scriptPath}\Output\Ziti Desktop Edge Client-${version}.exe.json"
 & .\Installer\output-build-json.ps1 -version $version -url $url -stream $stream -published_at $published_at -outputPath $outputPath
 
 echo "REMOVING .back files: ${scriptPath}\*back*"
diff --git a/build-test-release.ps1 b/build-test-release.ps1
index eaed88ab5..5d54280ca 100644
--- a/build-test-release.ps1
+++ b/build-test-release.ps1
@@ -15,8 +15,6 @@ param(
     [bool]$revertGitAfter = $true
 )
 echo ""
-$env:ZITI_DESKTOP_EDGE_DOWNLOAD_URL="$url"
-$env:ZITI_DESKTOP_EDGE_VERSION="$version"
 $scriptDirectory = Split-Path -Path $MyInvocation.MyCommand.Path -Parent
 
 $outputPath = "$scriptDirectory\release-streams\${version}.json"