From c215be26b7ac677a7ec90c7361085bae2942cea4 Mon Sep 17 00:00:00 2001
From: Andreas Traczyk <andreas.traczyk@savoirfairelinux.com>
Date: Thu, 14 Nov 2019 16:02:45 -0500
Subject: [PATCH] installer: change regkey path to stay appname(Jami) when beta
Change-Id: Ib1271ac33a0d61b32208daeca25ab2e84eb90030
---
JamiInstaller/Config.wxi | 2 +-
JamiInstaller/Product.wxs | 8 ++------
2 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/JamiInstaller/Config.wxi b/JamiInstaller/Config.wxi
index 8f83ebb..f24ee3f 100644
--- a/JamiInstaller/Config.wxi
+++ b/JamiInstaller/Config.wxi
@@ -12,7 +12,7 @@
<?define ReleaseDir="..\x64\Beta"?>
<?endif ?>
- <?define FolderName="Jami" ?>
+ <?define AppName="Jami" ?>
<?define Manufacturer="Savoir-Faire Linux"?>
<?define UcrtDir="C:\Program Files (x86)\Windows Kits\10\Redist\ucrt\DLLs\x64"?>
diff --git a/JamiInstaller/Product.wxs b/JamiInstaller/Product.wxs
index ce4121e..b8a9f11 100644
--- a/JamiInstaller/Product.wxs
+++ b/JamiInstaller/Product.wxs
@@ -75,11 +75,7 @@
<Fragment Id="OtherRegistryEntries">
<DirectoryRef Id="TARGETDIR">
<Component Id="RegistryEntries" Guid="*" Win64="yes">
- <RegistryKey Root="HKCU"
- Key="Software\jami.net\$(var.Name)"
- Action="createAndRemoveOnUninstall">
- <RegistryValue Type="integer" Name="hasRun" Value="0" KeyPath="yes" Action='write'/>
- </RegistryKey>
+ <RegistryValue Root="HKCU" Key="Software\jami.net\$(var.AppName)" Name="hasRun" Type="integer" Value="0" KeyPath="yes" />
</Component>
</DirectoryRef>
</Fragment>
@@ -89,7 +85,7 @@
<Property Id="WixAppFolder" Value="WixPerMachineFolder" />
<!--APPLICATIONFOLDER required by WixUI_Advanced, ApplicationFolderName reset APPLICATIONFOLDER path-->
- <Property Id="ApplicationFolderName" Value="$(var.Manufacturer)\$(var.FolderName)" />
+ <Property Id="ApplicationFolderName" Value="$(var.Manufacturer)\$(var.AppName)" />
<UIRef Id="WixUI_Advanced" />
<!--Remove User Exit Dialog-->
--
GitLab