From d7720c5f6d01d691202dcb57ff307135ec5295d2 Mon Sep 17 00:00:00 2001
From: Yuanle Song <sylecn@gmail.com>
Date: Sat, 23 Nov 2019 01:18:20 +0800
Subject: [PATCH] v0.6.1.0 allow Users group edit local config files

local config files includes:
local-list.txt
local-exclude.txt
mbackup-config.txt
.ssh

previously these files can only be modified by administrator, now
all users are allowed to modify them.
---
 Makefile       |  4 ++--
 mbackup.fsproj |  2 +-
 mbackup.wxs    | 18 +++++++++++++-----
 operational    | 15 ++++++++++++---
 4 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/Makefile b/Makefile
index 23586e8..d5b5e51 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 WIX_DIR := C:\Program Files (x86)\WiX Toolset v3.11\bin
 HEAT := "$(WIX_DIR)\heat.exe"
-CANDLE := "$(WIX_DIR)\candle.exe" -arch x64 -nologo
-LIGHT := "$(WIX_DIR)\light.exe" -nologo
+CANDLE := "$(WIX_DIR)\candle.exe" -arch x64 -nologo -ext WixUtilExtension
+LIGHT := "$(WIX_DIR)\light.exe" -nologo -ext WixUtilExtension
 
 RSYNC_MINGW_DIR := D:\downloads\apps\rsync-w64
 MBACKUP_PUBLISH_DIR := bin\Release\netcoreapp3.0\publish
diff --git a/mbackup.fsproj b/mbackup.fsproj
index c06723e..d78b641 100644
--- a/mbackup.fsproj
+++ b/mbackup.fsproj
@@ -23,7 +23,7 @@
     <RuntimeIdentifiers>win10-x64</RuntimeIdentifiers>
     <RootNamespace>Mbackup</RootNamespace>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-    <Version>0.6.0.0</Version>
+    <Version>0.6.1.0</Version>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/mbackup.wxs b/mbackup.wxs
index c624008..bb5b023 100644
--- a/mbackup.wxs
+++ b/mbackup.wxs
@@ -15,7 +15,7 @@
 
 <!-- You should have received a copy of the GNU General Public License along with -->
 <!-- mbackup-for-windows.  If not, see <http://www.gnu.org/licenses/>. -->
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
   <Product Id="*" UpgradeCode="3030B91E-5E3E-4151-9A69-B53B72690430" Version="$(var.Version)" Language="1033" Name="mbackup" Manufacturer="Yuanle Song">
     <Package InstallScope="perMachine" InstallerVersion="300" Compressed="yes"/>
     <Media Id="1" Cabinet="mbackup.cab" EmbedCab="yes" />
@@ -55,15 +55,21 @@
         </Component>
         <Component Id="local_list.txt" NeverOverwrite="yes" Permanent="yes" Guid="*">
             <!-- do not overwrite this component/file if it already exists on target system -->
-            <File Id="local_list.txt" Source="mbackup-config\local-list.txt" KeyPath="yes" />
+            <File Id="local_list.txt" Source="mbackup-config\local-list.txt" KeyPath="yes">
+                <util:PermissionEx User="Users" Domain="[MachineName]" GenericAll="yes" />
+            </File>
         </Component>
         <Component Id="local_exclude.txt" NeverOverwrite="yes" Permanent="yes" Guid="*">
             <!-- do not overwrite this component/file if it already exists on target system -->
-            <File Id="local_exclude.txt" Source="mbackup-config\local-exclude.txt" KeyPath="yes" />
+            <File Id="local_exclude.txt" Source="mbackup-config\local-exclude.txt" KeyPath="yes">
+                <util:PermissionEx User="Users" Domain="[MachineName]" GenericAll="yes" />
+            </File>
         </Component>
         <Component Id="mbackup_config.txt" NeverOverwrite="yes" Permanent="yes" Guid="*">
             <!-- do not overwrite this component/file if it already exists on target system -->
-            <File Id="mbackup_config.txt" Source="mbackup-config\mbackup-config.txt" KeyPath="yes" />
+            <File Id="mbackup_config.txt" Source="mbackup-config\mbackup-config.txt" KeyPath="yes">
+                <util:PermissionEx User="Users" Domain="[MachineName]" GenericAll="yes" />
+            </File>
         </Component>
         <Component Id="user_default_list.txt" Guid="*">
             <File Id="user_default_list.txt" Source="mbackup-config\user-default-list.txt" KeyPath="yes" />
@@ -71,7 +77,9 @@
     </DirectoryRef>
 
     <Component Id="mbackup_ssh_dir" Directory="MBACKUP_SSH_DIR" Guid="8FC95FD8-DFA3-45D0-9CF1-45F010FEA3E2">
-        <CreateFolder />
+        <CreateFolder>
+            <util:PermissionEx User="Users" Domain="[MachineName]" GenericAll="yes" />
+        </CreateFolder>
     </Component>
 
     <DirectoryRef Id="DesktopFolder">
diff --git a/operational b/operational
index a2323db..899b509 100644
--- a/operational
+++ b/operational
@@ -245,9 +245,8 @@ vscode should at least always indent using space for F#.
 
 * current                                                             :entry:
 ** 
-** 2019-11-19 allow local Users group to have full access to local list and local exclude file.
-by default, only admin can modify them, Users can only read/execute them.
-
+** 2019-11-23 add an icon for desktop shortcut.
+use recognizable backup icon, with some color.
 ** 2019-11-18 add dockerfile to create rsync mingw64 distribution,
 then update Makefile and wix xml files to use that.
 
@@ -259,6 +258,16 @@ Are there any code change required?
 
 ** 2019-11-18 add log rotate for %localappdata%\mbackup\mbackup.log
 * done                                                                :entry:
+** 2019-11-19 allow local Users group to have full access to local list and local exclude file.
+by default, only admin can modify them, Users can only read/execute them.
+
+visual studio 2010 - Giving permission to a folder in programdata using Wix - Stack Overflow
+https://stackoverflow.com/questions/21159873/giving-permission-to-a-folder-in-programdata-using-wix
+
+it works.
+- problems
+  - How To: Use WiX Extensions
+    https://wixtoolset.org/documentation/manual/v3/howtos/general/extension_usage_introduction.html
 ** 2019-11-23 update ssh config file path.
 don't use ~/.ssh/
 use %programdata%/mbackup/.ssh instead.
-- 
GitLab