From e1ff140981bf622ca594372665b021bd72773cef Mon Sep 17 00:00:00 2001
From: dovholuknf <46322585+dovholuknf@users.noreply.github.com>
Date: Tue, 20 Oct 2020 12:30:32 -0400
Subject: [PATCH] _sigh_ - this all needs to get unified into github - can't
 run the script from travis...

---
 Installer/build.ps1 |  4 ++++
 update-versions.ps1 | 27 ++++++++-------------------
 2 files changed, 12 insertions(+), 19 deletions(-)

diff --git a/Installer/build.ps1 b/Installer/build.ps1
index 8bed82b4..320f73cf 100644
--- a/Installer/build.ps1
+++ b/Installer/build.ps1
@@ -44,6 +44,10 @@ Pop-Location
 $ADVINST = "C:\Program Files (x86)\Caphyon\Advanced Installer 17.5\bin\x86\AdvancedInstaller.com"
 $ADVPROJECT = "${scriptPath}\ZitiDesktopEdge.aip"
 
+$action = '/SetVersion'
+echo "issuing $ADVINST /edit $ADVPROJECT $action $v - see https://www.advancedinstaller.com/user-guide/set-version.html"
+& $ADVINST /edit $ADVPROJECT $action $v
+
 $action = '/build'
 echo "Assembling installer using AdvancedInstaller at: $ADVINST $action $ADVPROJECT"
 & $ADVINST $arg1 $ADVPROJECT
diff --git a/update-versions.ps1 b/update-versions.ps1
index b715f3fc..3ec258df 100644
--- a/update-versions.ps1
+++ b/update-versions.ps1
@@ -1,10 +1,6 @@
 echo "==================================== update-versions.ps1 begins ===================================="
-$invocation = (Get-Variable MyInvocation).Value
-$scriptPath = Split-Path $invocation.MyCommand.Path
-${scriptPath}
-
-echo "Obtaining version information from ${scriptPath}\version"
-$v=(Get-Content -Path ${scriptPath}\version)
+echo "Obtaining version information from .\version"
+$v=(Get-Content -Path .\version)
 echo "          version: $v"
 echo ""
 
@@ -13,25 +9,18 @@ rm temp.aip -ErrorAction Ignore
 
 $assemblyInfo="./DesktopEdge/Properties/AssemblyInfo.cs"
 $assemblyInfoReplaced="${assemblyInfo}.replaced"
+$installer="./Installer/ZitiDesktopEdge.aip"
+$installerReplaced="${installer}.replaced"
 
 echo "Replacing version in $assemblyInfo into $assemblyInfoReplaced"
 (Get-Content -Encoding UTF8 -path $assemblyInfo -Raw) -replace 'Version\("[0-9]*.[0-9]*.[0-9]*.0', "Version(""${v}.0" | Set-Content -Encoding UTF8 -Path "$assemblyInfoReplaced" -NoNewline
 rm $assemblyInfo
 mv $assemblyInfoReplaced $assemblyInfo
 
-$ADVINST = "C:\Program Files (x86)\Caphyon\Advanced Installer 17.5\bin\x86\AdvancedInstaller.com"
-$ADVPROJECT = "${scriptPath}\Installer\ZitiDesktopEdge.aip"
-
-$action = '/SetVersion'
-echo "issuing $ADVINST /edit $ADVPROJECT $action $v - see https://www.advancedinstaller.com/user-guide/set-version.html"
-& $ADVINST /edit $ADVPROJECT $action $v
-
-#$installer="./Installer/ZitiDesktopEdge.aip"
-#$installerReplaced="${installer}.replaced"
-#echo "Replacing version in $installer into $installerReplaced"
-#(Get-Content -Encoding UTF8 -path $installer -Raw) -replace '"ProductVersion" Value="[0-9]*\.[0-9]*\.[0-9]*"', """ProductVersion"" Value=""${v}""" | Set-Content -Path "${installer}.replaced" -Encoding UTF8 -NoNewline
-#rm $installer
-#mv $installerReplaced $installer
+echo "Replacing version in $installer into $installerReplaced"
+(Get-Content -Encoding UTF8 -path $installer -Raw) -replace '"ProductVersion" Value="[0-9]*\.[0-9]*\.[0-9]*"', """ProductVersion"" Value=""${v}""" | Set-Content -Path "${installer}.replaced" -Encoding UTF8 -NoNewline
+rm $installer
+mv $installerReplaced $installer
 
 git status