build: Fix MSI to reuse InstallDir set in registry on upgrade

glpi-project · Apr 2, 2024 · ff412fa · ff412fa
1 parent a2476da
commit ff412fa
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/Changes b/Changes
@@ -7,6 +7,7 @@ packaging:
   even if LOCAL was not used or it was set empty in installer UI
 * Enhanced CVE-2024-28241 fix to only apply folder security if install folder and
   eventually LOCAL folder are subfolders of system "Program Files" folder
+* Fix MSI to reuse InstallDir set in registry on upgrade
 
 1.7.2 Mon, 25 Mar 2024
 

diff --git a/contrib/windows/packaging/MSI_main-v2.wxs.tt b/contrib/windows/packaging/MSI_main-v2.wxs.tt
@@ -30,6 +30,8 @@
     <Property Id="UPGRADEDIR" Secure="yes">
       <RegistrySearch Id="InstallDir" Root="HKLM" Key="[%agent_regpath%]\Installer" Name="InstallDir" Type="raw" />
     </Property>
+    <!-- Reuse InstallDir set in registry if possible -->
+    <SetProperty Id="INSTALLDIR" After="AppSearch" Value="[UPGRADEDIR]"><![CDATA[INSTALLDIR="" AND UPGRADEDIR<>"" AND CMDLINE_CONFIG<>"reset"]]></SetProperty>
 
     <Property Id="QUICKINSTALL" Secure="yes">
       <RegistrySearch Id="QuickInstall" Root="HKLM" Key="[%agent_regpath%]\Installer" Name="QuickInstall" Type="raw" />