2Shirt/duplicity-backup.sh
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix issue #177: bug in cleanup action

Browse source
This commit is contained in:
zertrin 2018-05-22 11:09:53 +08:00
parent 5cad03cb3e
commit 4dd6ed1ee2
1 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
duplicity-backup.sh
View file

@ -191,7 +191,7 @@ while getopts ":c:t:bfvelsqndhV-:" opt; do
QUIET=1 QUIET=1
;; ;;
dry-run) dry-run)
DRY_RUN="--dry-run " DRY_RUN="--dry-run"
;; ;;
debug) debug)
ECHO=$(which echo) ECHO=$(which echo)
@ -218,7 +218,7 @@ while getopts ":c:t:bfvelsqndhV-:" opt; do
l) COMMAND="list-current-files";; l) COMMAND="list-current-files";;
s) COMMAND="collection-status";; s) COMMAND="collection-status";;
q) QUIET=1;; q) QUIET=1;;
n) DRY_RUN="--dry-run ";; # dry run n) DRY_RUN="--dry-run";; # dry run
d) ECHO=$(which echo);; # debug d) ECHO=$(which echo);; # debug
h) h)
usage usage
@ -342,7 +342,13 @@ fi
# ------------------------- Setting up variables ------------------------ # ------------------------- Setting up variables ------------------------
STATIC_OPTIONS="${DRY_RUN}${STATIC_OPTIONS}" if [ -n "${DRY_RUN}" ]; then
STATIC_OPTIONS="${DRY_RUN} ${STATIC_OPTIONS}"
fi
if [ -n "${STORAGECLASS}" ]; then
STATIC_OPTIONS="${STATIC_OPTIONS} ${STORAGECLASS}"
fi
SIGN_PASSPHRASE=${PASSPHRASE} SIGN_PASSPHRASE=${PASSPHRASE}
@ -834,7 +840,6 @@ duplicity_backup()
{ {
{ {
eval "${ECHO}" "${DUPLICITY}" "${OPTION}" "${VERBOSITY}" "${STATIC_OPTIONS}" \ eval "${ECHO}" "${DUPLICITY}" "${OPTION}" "${VERBOSITY}" "${STATIC_OPTIONS}" \
"${STORAGECLASS}" \
"${ENCRYPT}" \ "${ENCRYPT}" \
"${EXCLUDE}" \ "${EXCLUDE}" \
"${INCLUDE}" \ "${INCLUDE}" \
@ -849,6 +854,7 @@ duplicity_cleanup_failed()
{ {
{ {
eval "${ECHO}" "${DUPLICITY}" "${OPTION}" "${VERBOSITY}" "${STATIC_OPTIONS}" \ eval "${ECHO}" "${DUPLICITY}" "${OPTION}" "${VERBOSITY}" "${STATIC_OPTIONS}" \
"${ENCRYPT}" \
"${DEST}" "${DEST}"
} || { } || {
BACKUP_ERROR=1 BACKUP_ERROR=1
@ -1013,7 +1019,7 @@ case "${COMMAND}" in
OPTION="cleanup" OPTION="cleanup"
if [ -z "${DRY_RUN}" ]; then if [ -z "${DRY_RUN}" ]; then
STATIC_OPTIONS="--force" STATIC_OPTIONS="${STATIC_OPTIONS} --force"
fi fi
echo -e "-------[ Cleaning up Destination ]-------\n" echo -e "-------[ Cleaning up Destination ]-------\n"