From 528b24edb6315ec384c0747862d03e9d8b2dda42 Mon Sep 17 00:00:00 2001 From: Yuanle Song Date: Sat, 30 Nov 2019 14:55:35 +0800 Subject: [PATCH] v0.6.2.0 ensure local list and local exclude file is in utf-8 encoding. This allow user to edit the file in notepad and type unicode character easily. --- README.md | 3 ++- mbackup-config/local-exclude.txt | 1 + mbackup-config/local-list.txt | 1 + mbackup.fsproj | 2 +- operational | 12 +++++++++++- 5 files changed, 16 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 7a29490..8a1bc6c 100644 --- a/README.md +++ b/README.md @@ -61,7 +61,8 @@ Here are the backup list files and exclude pattern files: local-list.txt and local-exclude.txt are managed by user. mbackup will not modify those files when it is uninstalled or upgraded. The other lists are shipped with mbackup and will be removed/overwritten when -uninstalling/upgrading mbackup. +uninstalling/upgrading mbackup. All text files should be in utf-8 encoding, +especially if they include unicode file path. To learn more about file list and exclude patterns, read rsync man page https://download.samba.org/pub/rsync/rsync.html --files-from option, diff --git a/mbackup-config/local-exclude.txt b/mbackup-config/local-exclude.txt index b8f8bbe..2212e5f 100644 --- a/mbackup-config/local-exclude.txt +++ b/mbackup-config/local-exclude.txt @@ -1,6 +1,7 @@ # files/dirs to exclude, for syntax, check rsync patterns # This file is reserved when uninstall/upgrade mbackup. # lines started with # are comments. +# unicode characters in path is supported such as D:\Movies\疯狂的赛车\*** # example: # *.o # C:\foo\bar.iso diff --git a/mbackup-config/local-list.txt b/mbackup-config/local-list.txt index 7cdeaf8..dbd911e 100644 --- a/mbackup-config/local-list.txt +++ b/mbackup-config/local-list.txt @@ -1,6 +1,7 @@ # local dirs to backup. # This file is reserved when uninstall/upgrade mbackup. # lines started with # are comments. +# unicode characters in path is supported such as D:\Movies\疯狂的赛车 # example: # C:\mydir # D:\some dir\some file.doc diff --git a/mbackup.fsproj b/mbackup.fsproj index d78b641..5f1a0d3 100644 --- a/mbackup.fsproj +++ b/mbackup.fsproj @@ -23,7 +23,7 @@ win10-x64 Mbackup true - 0.6.1.0 + 0.6.2.0 diff --git a/operational b/operational index f0122a8..1cf66ca 100644 --- a/operational +++ b/operational @@ -1,6 +1,6 @@ * COMMENT -*- mode: org -*- #+Date: 2019-11-12 -Time-stamp: <2019-11-18> +Time-stamp: <2019-11-30> #+STARTUP: content * notes :entry: ** 2019-11-12 mbackup for windows :featurereq: @@ -245,6 +245,11 @@ vscode should at least always indent using space for F#. * current :entry: ** +** 2019-11-30 bug: mbackup local exclude config is not used in rsync command. +L271 should use win path when check whether file exists. + +- can I use typing to specify when a Linux path is required and when a windows + path is required? ** 2019-11-24 Make sure Chinese file name works in local.list file. ** 2019-11-23 when default .ssh dir is in %programdata%\mbackup\.ssh, there is a security concern. @@ -284,6 +289,11 @@ Are there any code change required? ** 2019-11-18 add log rotate for %localappdata%\mbackup\mbackup.log * done :entry: +** 2019-11-30 shipped local list, local exclude file should be in utf-8 encoding. +when user open the file using notepad, it should be in utf-8 encoding. +just add some unicode character in shipped local list file and save in utf-8 encoding +in windows. + ** 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. -- GitLab