CalvinBackup/tauri
1
0
Fork 0
mirror of https://github.com/tauri-apps/tauri.git synced 2026-04-01 10:01:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix(bundler) wix template escape character (#2608)

Browse Source 
Co-authored-by: Lucas Nogueira <lucas@tauri.studio>
This commit is contained in:
Robert Buchanan
2021-09-21 11:43:51 -04:00
committed by GitHub
parent d5f07d14f3
commit 2be1abd112
3 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
.changes/wix-registry-keys.md Normal file
View File

@@ -0,0 +1,5 @@
---
"tauri-bundler": patch
---
Fix registry keys on the WiX template.

8
tooling/bundler/src/bundle/path_utils.rs
View File

@@ -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 {

6
tooling/bundler/src/bundle/windows/templates/main.wxs
View File

@@ -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>