From c59c50fa255cb0050efe46722b668c9ed011c70e Mon Sep 17 00:00:00 2001
From: Bill Zissimopoulos <billziss@navimatics.com>
Date: Thu, 30 Nov 2017 22:40:35 -0800
Subject: [PATCH] installer: include computer architecture in product name

---
 sshfs-win.wxs | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/sshfs-win.wxs b/sshfs-win.wxs
index 4834e51..0d30741 100644
--- a/sshfs-win.wxs
+++ b/sshfs-win.wxs
@@ -13,14 +13,14 @@
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
     <Product
         Id="*"
-        Name="$(var.MyProductName)"
+        Name="$(var.MyProductName) ($(var.MyArch))"
         Manufacturer="$(var.MyCompanyName)"
         Version="$(var.MyVersion)"
         Language="1033"
         UpgradeCode="$(var.UpgradeCode)">
 
         <Package
-            Description="$(var.MyProductName) - $(var.MyDescription)"
+            Description="$(var.MyProductName) ($(var.MyArch)) - $(var.MyDescription)"
             InstallerVersion="200"
             Compressed="yes"
             InstallScope="perMachine" />
@@ -28,14 +28,14 @@
             Disallow="yes"
             AllowDowngrades="no"
             AllowSameVersionUpgrades="no"
-            DisallowUpgradeErrorMessage="An older version of [ProductName] is already installed. You must uninstall it before you can install this version."
-            DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
+            DisallowUpgradeErrorMessage="An older version of $(var.MyProductName) is already installed. You must uninstall it before you can install this version."
+            DowngradeErrorMessage="A newer version of $(var.MyProductName) is already installed." />
         <Media Id="1" Cabinet="sshfs_win.cab" EmbedCab="yes" />
 
         <Property Id="OTHERINSTALLED">
             <ProductSearch UpgradeCode="$(var.OtherUpgradeCode)" Minimum="0.0.0.0" />
         </Property>
-        <Condition Message="A version of [ProductName] with a different computer architecture is already installed. You must uninstall it before you can install this version.">
+        <Condition Message="A version of $(var.MyProductName) with a different computer architecture is already installed. You must uninstall it before you can install this version.">
             NOT OTHERINSTALLED
         </Condition>
 
@@ -101,7 +101,7 @@
         <Feature
             Id="F.Main"
             Level="1"
-            Title="$(var.MyProductName) $(var.MyVersion)"
+            Title="$(var.MyProductName) ($(var.MyArch)) $(var.MyVersion)"
             Description="$(var.MyDescription)"
             Display="expand"
             ConfigurableDirectory="INSTALLDIR"