Fix: Installer package

BornToBeRoot · May 26, 2024 · b434d95 · b434d95
1 parent 5216617
commit b434d95
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/Source/NETworkManager.Setup/Package.wxs b/Source/NETworkManager.Setup/Package.wxs
@@ -5,6 +5,7 @@
 	<Package Name="NETworkManager 20$(var.ProductVersion).0"
 			 Manufacturer="BornToBeRoot"
 			 Version="$(var.ProductVersion)"
+
 			 UpgradeCode="e343d8ab-ed71-41d1-9784-6f6860bda078">
 		<MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" />
 
@@ -27,11 +28,11 @@
 		</Feature>
 
 		<!-- Uninstall InnoSetup version -->	
-		<!-- Get-Item "HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{8028080F-B785-4A74-A243-3D63467880A6}_is1" -ErrorAction SilentlyContinue | ForEach-Object {Start-Process -FilePath $($_.GetValue("UninstallString")) -ArgumentList "/VERYSILENT /SUPPRESSMSGBOXES /NORESTART" -Wait} -->
-		<CustomAction Id="UninstallInnoSetup" Directory="INSTALLFOLDER" Execute="deferred" Impersonate="yes" ExeCommand="PowerShell.exe -NoProfile -WindowStyle Hidden -EncodedCommand &quot;RwBlAHQALQBJAHQAZQBtACAAIgBIAEsATABNADoAXABTAE8ARgBUAFcAQQBSAEUAXABNAGkAYwByAG8AcwBvAGYAdABcAFcAaQBuAGQAbwB3AHMAXABDAHUAcgByAGUAbgB0AFYAZQByAHMAaQBvAG4AXABVAG4AaQBuAHMAdABhAGwAbABcAHsAOAAwADIAOAAwADgAMABGAC0AQgA3ADgANQAtADQAQQA3ADQALQBBADIANAAzAC0AMwBEADYAMwA0ADYANwA4ADgAMABBADYAfQBfAGkAcwAxACIAIAAtAEUAcgByAG8AcgBBAGMAdABpAG8AbgAgAFMAaQBsAGUAbgB0AGwAeQBDAG8AbgB0AGkAbgB1AGUAIAB8ACAARgBvAHIARQBhAGMAaAAtAE8AYgBqAGUAYwB0ACAAewBTAHQAYQByAHQALQBQAHIAbwBjAGUAcwBzACAALQBGAGkAbABlAFAAYQB0AGgAIAAkACgAJABfAC4ARwBlAHQAVgBhAGwAdQBlACgAIgBVAG4AaQBuAHMAdABhAGwAbABTAHQAcgBpAG4AZwAiACkAKQAgAC0AQQByAGcAdQBtAGUAbgB0AEwAaQBzAHQAIAAiAC8AVgBFAFIAWQBTAEkATABFAE4AVAAgAC8AUwBVAFAAUABSAEUAUwBTAE0AUwBHAEIATwBYAEUAUwAgAC8ATgBPAFIARQBTAFQAQQBSAFQAIgAgAC0AVwBhAGkAdAB9AA==&quot;" Return="check" />
+		<!-- try {Get-Item "HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{8028080F-B785-4A74-A243-3D63467880A6}_is1" -ErrorAction Stop | ForEach-Object {Start-Process -FilePath $($_.GetValue("UninstallString")) -ArgumentList "/VERYSILENT /SUPPRESSMSGBOXES /NORESTART" -Wait}} catch {} finally {exit 0} -->
+		<CustomAction Id="UninstallInnoSetup" Directory="INSTALLFOLDER" Execute="deferred" Impersonate="yes" ExeCommand="PowerShell.exe -NoProfile -WindowStyle Hidden -EncodedCommand &quot;dAByAHkAIAB7AEcAZQB0AC0ASQB0AGUAbQAgACIASABLAEwATQA6AFwAUwBPAEYAVABXAEEAUgBFAFwATQBpAGMAcgBvAHMAbwBmAHQAXABXAGkAbgBkAG8AdwBzAFwAQwB1AHIAcgBlAG4AdABWAGUAcgBzAGkAbwBuAFwAVQBuAGkAbgBzAHQAYQBsAGwAXAB7ADgAMAAyADgAMAA4ADAARgAtAEIANwA4ADUALQA0AEEANwA0AC0AQQAyADQAMwAtADMARAA2ADMANAA2ADcAOAA4ADAAQQA2AH0AXwBpAHMAMQAiACAALQBFAHIAcgBvAHIAQQBjAHQAaQBvAG4AIABTAHQAbwBwACAAfAAgAEYAbwByAEUAYQBjAGgALQBPAGIAagBlAGMAdAAgAHsAUwB0AGEAcgB0AC0AUAByAG8AYwBlAHMAcwAgAC0ARgBpAGwAZQBQAGEAdABoACAAJAAoACQAXwAuAEcAZQB0AFYAYQBsAHUAZQAoACIAVQBuAGkAbgBzAHQAYQBsAGwAUwB0AHIAaQBuAGcAIgApACkAIAAtAEEAcgBnAHUAbQBlAG4AdABMAGkAcwB0ACAAIgAvAFYARQBSAFkAUwBJAEwARQBOAFQAIAAvAFMAVQBQAFAAUgBFAFMAUwBNAFMARwBCAE8AWABFAFMAIAAvAE4ATwBSAEUAUwBUAEEAUgBUACIAIAAtAFcAYQBpAHQAfQB9ACAAYwBhAHQAYwBoACAAewB9ACAAZgBpAG4AYQBsAGwAeQAgAHsAZQB4AGkAdAAgADAAfQA=&quot;" Return="check" />
 
 		<InstallExecuteSequence>
-			<Custom Action="UninstallInnoSetup" After="InstallInitialize" />
+			<Custom Action="UninstallInnoSetup" After="InstallInitialize" Condition="NOT Installed" />
 		</InstallExecuteSequence>
 	</Package>