From f1d23ead0700340ccc5c263aa2df9d5f59c8bf5e Mon Sep 17 00:00:00 2001 From: Jarno Rankinen Date: Thu, 22 Oct 2020 19:16:10 +0300 Subject: [PATCH] snapsh-post-rollback.service fixed Globbing (*.backup) fixed --- snapsh | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/snapsh b/snapsh index ae284f7..846d588 100755 --- a/snapsh +++ b/snapsh @@ -238,19 +238,24 @@ post-rollback() { echo "Checking for leftover subvolumes..." | systemd-cat -t snapsh - BACKUPS=("${TOPLEVEL}/*.backup/") + BACKUPS=(${TOPLEVEL}/*.backup/) - if [[ -n "$BACKUPS" ]]; then - for backup in ${TOPLEVEL}/*.backup/; do + if [[ -n "${BACKUPS[@]}" ]]; then + + for backup in "${BACKUPS[@]}"; do echo "${backup} found" | systemd-cat -t snapsh - echo "Deleting ${backup}..." | systemd-cat -t snapsh + echo "Deleting ${backup}..." | systemd-cat -t snapsh ${BTRFS_EXECUTABLE} subvolume delete ${backup} > /dev/null - let EXIT_CODE=${EXIT_CODE}+$? + let EXIT_CODE=${EXIT_CODE}+${?} done + exit ${EXIT_CODE} + else + echo "No leftovers found." | systemd-cat -t snapsh exit 0 + fi }