From 2be1abd112cc3d927c235b6d00a508e6d35be49e Mon Sep 17 00:00:00 2001
From: Robert Buchanan <robbie.buchanan@ioneyed.com>
Date: Tue, 21 Sep 2021 11:43:51 -0400
Subject: [PATCH] fix(bundler) wix template escape character (#2608)

Co-authored-by: Lucas Nogueira <lucas@tauri.studio>
---
 .changes/wix-registry-keys.md                         | 5 +++++
 tooling/bundler/src/bundle/path_utils.rs              | 8 +-------
 tooling/bundler/src/bundle/windows/templates/main.wxs | 6 +++---
 3 files changed, 9 insertions(+), 10 deletions(-)
 create mode 100644 .changes/wix-registry-keys.md

diff --git a/.changes/wix-registry-keys.md b/.changes/wix-registry-keys.md
new file mode 100644
index 000000000..f9930f3d4
--- /dev/null
+++ b/.changes/wix-registry-keys.md
@@ -0,0 +1,5 @@
+---
+"tauri-bundler": patch
+---
+
+Fix registry keys on the WiX template.
diff --git a/tooling/bundler/src/bundle/path_utils.rs b/tooling/bundler/src/bundle/path_utils.rs
index f945c2a20..40ccdeca8 100644
--- a/tooling/bundler/src/bundle/path_utils.rs
+++ b/tooling/bundler/src/bundle/path_utils.rs
@@ -8,7 +8,7 @@ use std::{
 };
 
 /// Directory options.
-#[derive(Clone)]
+#[derive(Default, Clone)]
 pub struct DirOpts {
   pub depth: u64,
 }
@@ -51,12 +51,6 @@ impl Default for Options {
   }
 }
 
-impl Default for DirOpts {
-  fn default() -> DirOpts {
-    DirOpts { depth: 0 }
-  }
-}
-
 impl Default for FileOpts {
   fn default() -> FileOpts {
     FileOpts {
diff --git a/tooling/bundler/src/bundle/windows/templates/main.wxs b/tooling/bundler/src/bundle/windows/templates/main.wxs
index bc4fd24cb..50c2004ec 100644
--- a/tooling/bundler/src/bundle/windows/templates/main.wxs
+++ b/tooling/bundler/src/bundle/windows/templates/main.wxs
@@ -71,7 +71,7 @@
                 <Component Id="ApplicationShortcutDesktop" Guid="*">
                     <Shortcut Id="ApplicationDesktopShortcut" Name="{{{product_name}}}" Description="Runs {{{product_name}}}" Target="[!Path]" WorkingDirectory="INSTALLDIR" />
                     <RemoveFolder Id="DesktopFolder" On="uninstall" />
-                    <RegistryValue Root="HKCU" Key="Software\{{{product_name}}}" Name="installed" Type="integer" Value="1" KeyPath="yes" />
+                    <RegistryValue Root="HKCU" Key="Software\\{{{product_name}}}" Name="installed" Type="integer" Value="1" KeyPath="yes" />
                 </Component>
             </Directory>
             <Directory Id="$(var.PlatformProgramFilesFolder)" Name="PFiles">
@@ -115,7 +115,7 @@
 							  On="uninstall" />
 
 				<RegistryValue Root="HKCR"
-							   Key="Software\{{{manufacturer}}}\{{{product_name}}}"
+							   Key="Software\\{{{manufacturer}}}\\{{{product_name}}}"
 							   Name="installed"
 							   Type="integer"
 							   Value="1"
@@ -134,7 +134,7 @@
                     <ShortcutProperty Key="System.AppUserModel.ID" Value="{{{manufacturer}}}"/>
                 </Shortcut>
                 <RemoveFolder Id="ApplicationProgramsFolder" On="uninstall"/>
-                <RegistryValue Root="HKCU" Key="Software\{{{manufacturer}}}\{{{product_name}}}" Name="installed" Type="integer" Value="1" KeyPath="yes"/>
+                <RegistryValue Root="HKCU" Key="Software\\{{{manufacturer}}}\\{{{product_name}}}" Name="installed" Type="integer" Value="1" KeyPath="yes"/>
            </Component>
         </DirectoryRef>