From e107fc9b3112b5efa37ecee739aa9017d5d3cc54 Mon Sep 17 00:00:00 2001 From: Daniel Seifert Date: Wed, 29 Jan 2025 12:35:34 +0100 Subject: [PATCH] logrotate already uses the latest backup --- CHANGELOG.md | 2 +- varbackup | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ec43f15..4156dc3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,5 +13,5 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - can create required configuration (if missing) - check current files against latest backup - save folder as archive - - older versions than the lastest are compressed + - all versions are compressed - use file rotation (max 100 files per default, customizable) \ No newline at end of file diff --git a/varbackup b/varbackup index d2da38c..f8bd2a0 100755 --- a/varbackup +++ b/varbackup @@ -37,13 +37,12 @@ if [ ! -f "${BACKUPDIR}../rotatemap_var.conf" ]; then fi [ -z ${isSilent} ] && echo "pack var directory" -tar cfP ${BACKUPDIR}var.new.tar ${BASEDIR}/var; +tar cfP ${BACKUPDIR}new.tar ${BASEDIR}/var; -if [ ! -f "${BACKUPDIR}var.tar" ] || [ "$(cmp ${BACKUPDIR}var.tar ${BACKUPDIR}var.new.tar)" ]; then - [ -f ${BACKUPDIR}var.tar ] && gzip -c ${BACKUPDIR}var.tar > ${BACKUPDIR}var.tar.gz && /usr/sbin/logrotate -fs ${BACKUPDIR}../rotatemap_var.state ${BACKUPDIR}../rotatemap_var.conf - mv ${BACKUPDIR}var.new.tar ${BACKUPDIR}var.tar +if [ ! -f "${BACKUPDIR}latest.tar" ] || [ "$(cmp ${BACKUPDIR}latest.tar ${BACKUPDIR}new.tar)" ]; then + cp ${BACKUPDIR}new.tar ${BACKUPDIR}latest.tar && mv ${BACKUPDIR}new.tar ${BACKUPDIR}var.tar && /usr/sbin/logrotate -fs ${BACKUPDIR}../rotatemap_var.state ${BACKUPDIR}../rotatemap_var.conf else - rm ${BACKUPDIR}var.new.tar + rm ${BACKUPDIR}new.tar fi [ -z ${isSilent} ] && echo "finished"