Merge pull request #80 from marbx/install-anywhere

DeleteConfig_DECAC after RemoveFolders
marbx · Jul 31, 2021 · ed0d75a · ed0d75a
2 parents 991c0b5 + bd7cf70
commit ed0d75a
Show file tree

Hide file tree

Showing 4 changed files with 70 additions and 26 deletions.
diff --git a/Product.md b/Product.md
@@ -75,6 +75,11 @@ In the DECAC:
     session.CustomActionData["mister"]      THIS WILL CRASH
 
 
+### Enforce feature installation (e.g. REMOVE_CONFIG not writtten to registry)
+
+    <SetProperty Id="REINSTALL" Value='ALL' Before="LaunchConditions">1</SetProperty>   
+    <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." MigrateFeatures="no"/>
+
 ### Conditional removal of lifetime data
 "Lifetime data" means any change that was not installed by the msi (during the life time of the application).
 

diff --git a/Product.wxs b/Product.wxs
@@ -13,24 +13,20 @@
     <Package InstallScope="perMachine" InstallerVersion="500" Compressed="yes"/>
 
 
-    <!--  Aborts -->
+    <!--  Abort installation if conditions are met -->
     <?if $(var.WIN64)="no" ?>
       <Condition Message="The 32bit variant must be installed on 32bit Windows.">not VersionNT64</Condition>
     <?endif?>
     <Condition Message="[AbortReason]">Installed or (not AbortReason)</Condition>
-
-    <!-- Conditions for installation -->
     <Condition Message="Installation requires Windows 7/Server 2012. Found MsiNTProductType [MsiNTProductType], VersionNT [VersionNT]">
       Installed
       OR  (MsiNTProductType = 1) AND (VersionNT >= 601)
       OR  (MsiNTProductType = 2) AND (VersionNT >= 602)
       OR  (MsiNTProductType = 3) AND (VersionNT >= 602)
     </Condition>
     <Condition Message="Installation requires 125 MB RAM. Found [PhysicalMemory] MB">Installed OR (PhysicalMemory > 125)</Condition>
-
     <!-- ReadConfig_IMCAC must run immediately as Admin, the msi cannot elevate before deferred, so the user must be Admin -->
     <Condition Message="Searching for configuration requires Administrator privileges. Please open from an elevated command prompt.">Privileged</Condition>
-
     <Condition Message='CONFIG_TYPE must not be "[CONFIG_TYPE]". Please use "Existing", "Custom" or "Default".'>
       Installed
       OR (CONFIG_TYPE = "Existing")
@@ -48,21 +44,22 @@
                                OR (NSIS_DISPLAYVERSION << "20")
                                OR (NSIS_DISPLAYVERSION << "30") OR NOT NSIS_DISPLAYVERSION) OR Installed]]>
     </Condition>
-
     <!-- Abort msi install if NSIS installed -->
     <Condition Message='Please manually uninstall Salt Minion [NSIS_DISPLAYVERSION]'>
       NOT (NSIS_UNINSTALLSTRING >> "uninst.exe")
     </Condition>
 
-    <!--
-        Properties unset by default:
+
+    <!-- Properties unset by default:
            MASTER
            MASTER_KEY
            MINION_ID
            MINION_CONFIG
            CUSTOM_CONFIG
            REMOVE_CONFIG
+           MOVE_CONF
     -->
+    <!-- Properties defaults -->
     <Property Id="CONFIG_TYPE"              Value="Existing"             />
     <Property Id="START_MINION"             Value="1"                    />
     <Property Id="ROOTDRIVE"                Value="C:\"/>  <!-- prevent msi to chose the drive with most space left -->
@@ -117,7 +114,7 @@
             Root="HKLM" Key="SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Salt Minion" Name="DisplayVersion" Type="raw" Win64="no" />
     </Property>
 
-    <!-- The sign of NSIS install  -->
+    <!-- Detect NSIS install -->
     <SetProperty Id="nsis_exe"              Before="LaunchConditions" Value="1">NSIS_UNINSTALLSTRING >> "uninst.exe"</SetProperty>
 
 
@@ -128,38 +125,61 @@ objShell.Run "net stop salt-minion", 0, true
 objShell.Run "cmd /c ping -n 5 127.0.0.1", 0, True
     </CustomAction>
 
-    <!-- Sequence with GUI   -->
+    <!--  The GUI Sequence  -->
+    <!--
+      Run with admin privilege.
+      No changes applied. msi asks for input from the user
+      https://docs.microsoft.com/en-us/windows/win32/msi/suggested-installuisequence
+      This sequence may be left out.
+      -->
     <InstallUISequence>
       <Custom Action='ReadConfig_IMCAC'            Before='MigrateFeatureStates'     >NOT Installed</Custom>
 
       <LaunchConditions After="AppSearch" /> <!-- Benefit  unclear. -->
     </InstallUISequence>
 
-    <!-- Sequence without GUI (silent, headless)   -->
+
+    <!--  The Install Sequence (aka server side) -->
+    <!--
+      Run with localsystem privilege .
+      https://docs.microsoft.com/en-us/windows/win32/msi/suggested-installexecutesequence
+      If the UI sequence took place, some (non-UI) actions can be are repeated (e.g. CostInitialize).
+
+      Actions before MigrateFeatureStates:
+        Custom action is placed before the transaction starts, coined "immediate".
+        You should not modifiy the system.
+      Actions after InstallFiles:
+        Custom action is placed after the transaction started, coined "deferred" and run in a sandbox.
+        Deferred custom actions (DECAC) need custum action helper (CADH) to access msi properties
+        You may modify the system.
+      -->
     <InstallExecuteSequence>
       <!-- stopSalt to release log file -->
-      <Custom Action='stopSalt'                   Before='InstallValidate'        >1</Custom>
+      <Custom Action='stopSalt'           Before='InstallValidate'        >1</Custom>
 
-      <Custom Action='ReadConfig_IMCAC'           Before='MigrateFeatureStates'   >NOT Installed</Custom>
-      <Custom Action='del_NSIS_DECAC'              After='InstallInitialize'      >nsis_exe</Custom>
+      <Custom Action='ReadConfig_IMCAC'   Before='MigrateFeatureStates'   >NOT Installed</Custom>
+      <Custom Action='del_NSIS_DECAC'      After='InstallInitialize'      >nsis_exe</Custom>
 
       <Custom Action='WriteConfig_CADH'
-              Before='WriteConfig_DECAC'                                          >NOT Installed</Custom>
-      <Custom Action='WriteConfig_DECAC'           After='WriteIniValues'         >NOT Installed</Custom>
+              Before='WriteConfig_DECAC'                                 >NOT Installed</Custom>
+      <Custom Action='WriteConfig_DECAC'  After='WriteIniValues'         >NOT Installed</Custom>
 
       <Custom Action='DeleteConfig_CADH'
-              Before='DeleteConfig_DECAC'                                         >REMOVE ~= "ALL"</Custom>
-      <Custom Action='DeleteConfig_DECAC'          After='RemoveFiles'            >REMOVE ~= "ALL"</Custom>
+              Before='DeleteConfig_DECAC'                                >REMOVE ~= "ALL"</Custom>
+      <Custom Action='DeleteConfig_DECAC' After='RemoveFolders'          >REMOVE ~= "ALL"</Custom>
 
       <!-- Optionally start the service  -->
       <StartServices Sequence="5900"><![CDATA[START_MINION = "1"]]></StartServices>
     </InstallExecuteSequence>
 
 
+    <!-- Prevent downgrade -->
     <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
 
+
+    <!-- Install VC++ runtime -->
     <DirectoryRef Id="TARGETDIR">
-    <!--Visual C++ runtimes depend on the target platform -->
+    <!-- Visual C++ runtimes depend on the target platform -->
     <?if $(var.WIN64)=yes ?>
       <Merge Id="MSM_VC140_CRT" SourceFile="c:\salt_msi_resources\Microsoft_VC140_CRT_x64.msm" DiskId="1" Language="0"/>
     <?else ?>
@@ -196,6 +216,7 @@ objShell.Run "cmd /c ping -n 5 127.0.0.1", 0, True
     </Feature>
 
 
+    <!-- Icons -->
     <Icon        Id="icon.ico"   SourceFile="Product-icon.ico" />
     <WixVariable Id="WixUIBannerBmp"  Value="Product-imgTop.jpg" />
     <WixVariable Id="WixUIDialogBmp"  Value="Product-imgLeft.png" />
@@ -261,7 +282,7 @@ objShell.Run "cmd /c ping -n 5 127.0.0.1", 0, True
     </UI>
 
 
-    <!-- Declare Immediate (*_IMCAC) and deferred (*_DECAC) custom action . -->
+    <!-- Declare Immediate (*_IMCAC) and deferred (*_DECAC) custom actions. -->
     <CustomAction Id="ReadConfig_IMCAC"     BinaryKey='MinionConfigExt' DllEntry='ReadConfig_IMCAC'       Execute='firstSequence'/>
     <CustomAction Id="del_NSIS_DECAC"       BinaryKey='MinionConfigExt' DllEntry='del_NSIS_DECAC'         Execute='deferred' Return='check' Impersonate='no'/>
     <CustomAction Id="WriteConfig_DECAC"    BinaryKey='MinionConfigExt' DllEntry='WriteConfig_DECAC'      Execute='deferred' Return='check' Impersonate='no'/>
@@ -289,9 +310,8 @@ objShell.Run "cmd /c ping -n 5 127.0.0.1", 0, True
       </Directory>
     </Directory>
     <!-- Set CONFIGDIR to C:\salt unless MOVE_CONF (only before install sequence)  -->
-    <SetProperty Id="CONFIGDIR" Value="C:\salt\" Sequence="execute" Before="CostFinalize" Action="scd1">not MOVE_CONF</SetProperty>
-    <SetProperty Id="CONFDIR" Value="C:\salt\conf" Sequence="execute" Before="CostFinalize" Action="scd2">not MOVE_CONF</SetProperty>
-
+    <SetDirectory Id="CONFIGDIR" Value="C:\salt\"      Sequence="execute">not MOVE_CONF</SetDirectory>
+    <SetDirectory Id="CONFDIR"   Value="C:\salt\conf\" Sequence="execute">not MOVE_CONF</SetDirectory>
     <!-- Set ownership to 'Localized qualified name of the Administrators group' -->
     <PropertyRef Id="WIX_ACCOUNT_ADMINISTRATORS" />
     <Component Id="INSTALLDIR_Permissions"  Directory="INSTALLDIR" Guid="B30E119F-0286-4453-8AB7-C6E916FA2843">
@@ -306,8 +326,7 @@ objShell.Run "cmd /c ping -n 5 127.0.0.1", 0, True
     </Component>
 
 
-
-    <!--  Windows service (nssm and without)-->
+    <!--  Install Windows service (nssm and without)-->
     <?if 1=1 ?>
     <ComponentGroup Id="service">
       <Component Id="cmp906378FA53882935FD2EC0CC58D32FAC" Directory="INSTALLDIR" Guid="{E27F3682-194D-4CC2-9F9B-F3E1D53ADCDB}">

diff --git a/test_dirs_reg_service.cmd b/test_dirs_reg_service.cmd
@@ -0,0 +1,20 @@
+@echo off
+IF exist  "c:\salt\conf" (
+echo      "c:\salt\conf" 
+dir /b /s "c:\salt\conf" )
+
+IF exist  "C:\ProgramData\Salt Project\salt\conf" (
+echo      "C:\ProgramData\Salt Project\salt\conf"
+dir  /b   "C:\ProgramData\Salt Project\salt\conf" )
+
+IF exist  "C:\Program Files (x86)\Salt Project\salt" (
+echo      "C:\Program Files (x86)\Salt Project\salt"
+dir  /b   "C:\Program Files (x86)\Salt Project\salt" )
+
+IF exist  "C:\Program Files\Salt Project\salt" (
+echo      "C:\Program Files\Salt Project\salt" 
+dir /b    "C:\Program Files\Salt Project\salt" )
+
+Reg Query "HKLM\SOFTWARE\Salt Project\salt"
+
+sc query salt-minion
diff --git a/uninstall.cmd b/uninstall.cmd
@@ -1 +1 @@
-msiexec /x %1 /qb! /l*v %1-uninstall.log
+msiexec /x %* /qb! /l*v %1-uninstall.log
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		msiexec /x %1 /qb! /l*v %1-uninstall.log
		msiexec /x %* /qb! /l*v %1-uninstall.log