Diff
1diff --git a/duplicity-backup.sh b/duplicity-backup.sh
2index c0da563ee03407a01899c062fd52e2fe613b90cd..3e529a72de678466f31d1e0c6934a33dae2be407 100755
3--- a/duplicity-backup.sh
4+++ b/duplicity-backup.sh
5@@ -2,7 +2,7 @@
6 #
7 # Copyright (c) 2008-2010 Damon Timm.
8 # Copyright (c) 2010 Mario Santagiuliana.
9-# Copyright (c) 2012-2016 Marc Gallet.
10+# Copyright (c) 2012-2017 Marc Gallet.
11 #
12 # This program is free software: you can redistribute it and/or modify it under
13 # the terms of the GNU General Public License as published by the Free Software
14@@ -129,12 +129,12 @@ version_compare() {
15 version_compare "${DUPLICITY_VERSION}" 0.7
16 case $? in 2) LT07=1;; *) LT07=0;; esac
17
18-version(){
19- # Read the version string from the file VERSION
20- VERSION=$(<VERSION)
21+# Read the version string from the file VERSION
22+DBSH_VERSION=$(<VERSION)
23
24- echo "duplicity-backup.sh ${VERSION}"
25- ${DUPLICITY} --version
26+version(){
27+ echo "duplicity-backup.sh ${DBSH_VERSION}"
28+ echo "duplicity ${DUPLICITY_VERSION}"
29 exit 0
30 }
31
32@@ -305,7 +305,7 @@ fi
33 # fd1 is stdout and is always logged but only shown if not QUIET
34 # fd2 is stderr and is always shown on screen and logged
35 # fd3 is like stdout but always shown on screen (for interactive prompts)
36-# fd4 is always shown on sceen but never logged (for the usage text)
37+# fd4 is always shown on screen but never logged (for the usage text)
38 # fd5 is never shown on screen but always logged (for delimiters in the log)
39 #
40
41@@ -900,6 +900,10 @@ check_variables
42
43 echo -e "-------- START DUPLICITY-BACKUP SCRIPT for ${HOSTNAME} --------\n" >&5
44
45+echo -e "-------[ Program versions ]-------\n"
46+echo -e "duplicity-backup.sh ${DBSH_VERSION}\n"
47+echo -e "duplicity ${DUPLICITY_VERSION}\n"
48+
49 get_lock
50
51 INCLUDE=