From 41a2e731eb61a274b16b16f4a764fc2665d460d7 Mon Sep 17 00:00:00 2001
From: Neil Alexander <neilalexander@users.noreply.github.com>
Date: Thu, 28 Nov 2019 09:52:14 +0000
Subject: [PATCH] More MSI updates (#622)

* Try embedding config script

* Update config when installing

* Don't update config on uninstall
---
 contrib/msi/build-msi.sh | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/contrib/msi/build-msi.sh b/contrib/msi/build-msi.sh
index d314b0c6..de459e54 100644
--- a/contrib/msi/build-msi.sh
+++ b/contrib/msi/build-msi.sh
@@ -147,7 +147,7 @@ cat > wix.xml << EOF
           <Component Id="ConfigScript" Guid="64a3733b-c98a-4732-85f3-20cd7da1a785">
             <File
               Id="Configbat"
-              Name="config.bat"
+              Name="updateconfig.bat"
               DiskId="1"
               Source="config.bat"
               KeyPath="yes"/>
@@ -168,14 +168,16 @@ cat > wix.xml << EOF
     <CustomAction
       Id="UpdateGenerateConfig"
       Directory="YggdrasilInstallFolder"
-      ExeCommand="config.bat"
-      Execute="commit"
-      Return="asyncWait"/>
+      ExeCommand="cmd.exe /c updateconfig.bat"
+      Execute="immediate"
+      Return="asyncWait" />
 
     <InstallExecuteSequence>
       <Custom
         Action="UpdateGenerateConfig"
-        Before="MsiConfigureServices" />
+        After="InstallFiles">
+          NOT Installed AND NOT REMOVE
+      </Custom>
     </InstallExecuteSequence>
 
   </Product>