From fe338eb8426cb5fc300cf077ca2f36ea7a62ffd3 Mon Sep 17 00:00:00 2001
From: Paul Betts <paul@paulbetts.org>
Date: Wed, 14 Oct 2015 15:43:02 -0700
Subject: [PATCH] Fix up our WiX template a bit

---
 vendor/wix/template.wxs | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/vendor/wix/template.wxs b/vendor/wix/template.wxs
index df265d77..5fa8c4e8 100644
--- a/vendor/wix/template.wxs
+++ b/vendor/wix/template.wxs
@@ -1,11 +1,15 @@
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:util="http://schemas.microsoft.com/wix/UtilExtension" xmlns:netfx="http://schemas.microsoft.com/wix/NetFxExtension">
   <Product Id="*" Name="{{Title}} Machine-Wide Installer" Language="1033" Version="1.2.4" UpgradeCode="{{RandomGuid}}" Manufacturer="{{Author}}">
 
-    <PropertyRef Id="NETFRAMEWORK45" />
-
     <Package Description="#Description" Comments="Comments" InstallerVersion="200" Compressed="yes"/>
 		<Media Id="1" Cabinet="contents.cab" EmbedCab="yes" CompressionLevel="high"/>
 
+    <PropertyRef Id="NETFRAMEWORK45" />
+
+    <Condition Message="This application requires .NET Framework 4.5. Please install the .NET Framework then run this installer again.">
+      <![CDATA[Installed OR NETFRAMEWORK45]]>
+    </Condition>
+
     <Directory Id="TARGETDIR" Name="SourceDir">
       <Directory Id="ProgramFilesFolder">
         <Directory Id="APPLICATIONROOTDIRECTORY" Name="{{Title}} Installer" />
@@ -13,26 +17,22 @@
     </Directory>
 
     <DirectoryRef Id="APPLICATIONROOTDIRECTORY">
-      <Component Id="Setup.exe" Guid="08AD3BE1-EDA8-4182-BF8F-F47F805E28B8">
-        <File Id="Setup.exe" Source="./Setup.exe" KeyPath="yes" />
+      <Component Id="{{Id}}.exe" Guid="08AD3BE1-EDA8-4182-BF8F-F47F805E28B8">
+        <File Id="{{Id}}.exe" Source="./{{Id}}.exe" KeyPath="yes" />
       </Component>
     </DirectoryRef>
 
     <DirectoryRef Id="TARGETDIR">
       <Component Id="RegistryEntries" Guid="4438A0C1-7F86-4737-B929-8476305E1183">
         <RegistryKey Root="HKLM" Key="SOFTWARE\Microsoft\Windows\CurrentVersion\Run">
-          <RegistryValue Type="expandable" Name="{{Id}}MachineInstaller" Value="%ProgramFiles%\{{Title}} Installer\Setup.exe --checkInstall" />
+          <RegistryValue Type="expandable" Name="{{Id}}MachineInstaller" Value="%ProgramFiles%\{{Title}} Installer\{{Id}}.exe --checkInstall" />
         </RegistryKey>
       </Component>
     </DirectoryRef>
 
     <Feature Id="MainApplication" Title="Main Application" Level="1">
-      <ComponentRef Id="Setup.exe" />
+      <ComponentRef Id="{{Id}}.exe" />
       <ComponentRef Id="RegistryEntries" />
-
-      <Condition Message="This application requires .NET Framework 4.5. Please install the .NET Framework then run this installer again.">
-        <![CDATA[Installed OR NETFRAMEWORK45]]>
-      </Condition>
     </Feature>
   </Product>
 </Wix>