Diff
1diff --git a/duplicity-backup.sh b/duplicity-backup.sh
2index 06a8e6c3c393f4a0bb75b2e17d86e93d16aede7e..1d9df0c91ef81e1b652e1e53385579291e4b3a42 100755
3--- a/duplicity-backup.sh
4+++ b/duplicity-backup.sh
5@@ -191,7 +191,7 @@ while getopts ":c:t:bfvelsqndhV-:" opt; do
6 QUIET=1
7 ;;
8 dry-run)
9- DRY_RUN="--dry-run "
10+ DRY_RUN="--dry-run"
11 ;;
12 debug)
13 ECHO=$(which echo)
14@@ -218,7 +218,7 @@ while getopts ":c:t:bfvelsqndhV-:" opt; do
15 l) COMMAND="list-current-files";;
16 s) COMMAND="collection-status";;
17 q) QUIET=1;;
18- n) DRY_RUN="--dry-run ";; # dry run
19+ n) DRY_RUN="--dry-run";; # dry run
20 d) ECHO=$(which echo);; # debug
21 h)
22 usage
23@@ -342,7 +342,13 @@ fi
24
25 # ------------------------- Setting up variables ------------------------
26
27-STATIC_OPTIONS="${DRY_RUN}${STATIC_OPTIONS}"
28+if [ -n "${DRY_RUN}" ]; then
29+ STATIC_OPTIONS="${DRY_RUN} ${STATIC_OPTIONS}"
30+fi
31+
32+if [ -n "${STORAGECLASS}" ]; then
33+ STATIC_OPTIONS="${STATIC_OPTIONS} ${STORAGECLASS}"
34+fi
35
36 SIGN_PASSPHRASE=${PASSPHRASE}
37
38@@ -834,7 +840,6 @@ duplicity_backup()
39 {
40 {
41 eval "${ECHO}" "${DUPLICITY}" "${OPTION}" "${VERBOSITY}" "${STATIC_OPTIONS}" \
42- "${STORAGECLASS}" \
43 "${ENCRYPT}" \
44 "${EXCLUDE}" \
45 "${INCLUDE}" \
46@@ -849,6 +854,7 @@ duplicity_cleanup_failed()
47 {
48 {
49 eval "${ECHO}" "${DUPLICITY}" "${OPTION}" "${VERBOSITY}" "${STATIC_OPTIONS}" \
50+ "${ENCRYPT}" \
51 "${DEST}"
52 } || {
53 BACKUP_ERROR=1
54@@ -1013,7 +1019,7 @@ case "${COMMAND}" in
55 OPTION="cleanup"
56
57 if [ -z "${DRY_RUN}" ]; then
58- STATIC_OPTIONS="--force"
59+ STATIC_OPTIONS="${STATIC_OPTIONS} --force"
60 fi
61
62 echo -e "-------[ Cleaning up Destination ]-------\n"