98bcf9f67306b8edf867c498b6fdae719c4a26ab

Author
zertrin <zertrin@gmail.com>
Committer
zertrin <zertrin@gmail.com>
Date

Message

Bump version to 1.4.1

Diff

 1diff --git a/CHANGELOG b/CHANGELOG
 2index ed1645af65bb7e7dabe3cce44ddba2816ef3fb80..e7646d8497edcdb1726b119ba258a2e9039c9a9f 100644
 3--- a/CHANGELOG
 4+++ b/CHANGELOG
 5@@ -2,6 +2,10 @@ vX.X.X (unreleased)
 6 ===================
 7   * Placeholder for next release
 8 
 9+v1.4.1 (2017-10-04)
10+===================
11+  * Show program versions in output.
12+
13 v1.4.0 (2017-09-24)
14 ===================
15   * Add version check of duplicity to handle deprecation of --include-globbing-filelist
16diff --git a/README.md b/README.md
17index 8ba3bb2bb69c224990cb411be34b60a0ef8b8331..14404f25eaec6f1381f5456b6553a02cc4e5b89b 100644
18--- a/README.md
19+++ b/README.md
20@@ -80,8 +80,11 @@ If you prefer the stable version do:
21 
22 Or just download the ZIP file:
23 
24-* For the stable branch: https://github.com/zertrin/duplicity-backup.sh/archive/stable.zip
25-* For the normal branch: https://github.com/zertrin/duplicity-backup.sh/archive/master.zip
26+| Version       | Download link                                                     |
27+|---------------|-------------------------------------------------------------------|
28+| stable        | https://github.com/zertrin/duplicity-backup.sh/archive/stable.zip |
29+| normal        | https://github.com/zertrin/duplicity-backup.sh/archive/master.zip |
30+| bleeding-edge | https://github.com/zertrin/duplicity-backup.sh/archive/dev.zip    |
31 
32 ### 2. Configure the script
33 
34@@ -94,7 +97,7 @@ The script looks for its configuration by reading the path to the config file sp
35 If no config file was given on the command line, the script will try to find the file specified in the `CONFIG` parameter at the beginning of the script (default: `duplicity-backup.conf` in the script's directory).
36 
37 So be sure to either:
38-* specify the configuration file path on the command line with the -c option **[recommended]**
39+* specify the configuration file path on the command line with the `-c` option **[recommended]**
40 * or to edit the `CONFIG` parameter in the script to match the actual location of your config file. **[deprecated]** _(will be removed in future versions of the script)_
41 
42 NOTE: to ease future updates of the script, you may prefer NOT to edit the script at all and to specify systematically the path to your config file on the command line with the `-c` or `--config` option.
43diff --git a/VERSION b/VERSION
44index 0d0c52f84db3be4707373aa51e6d44a79dd100ab..66d62a800132c0abf33d6f42904e6d0036323e95 100644
45--- a/VERSION
46+++ b/VERSION
47@@ -1 +1 @@
48-v1.4.0
49+v1.4.1