From 0d986a99cd56254222d43ae1712fa5cdd0c59894 Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Fri, 21 Oct 2016 04:03:14 +0200 Subject: [PATCH] should work, to be tested --- lgsm/functions/command_backup.sh | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/lgsm/functions/command_backup.sh b/lgsm/functions/command_backup.sh index 83f9204aa..b198278b3 100644 --- a/lgsm/functions/command_backup.sh +++ b/lgsm/functions/command_backup.sh @@ -139,21 +139,20 @@ fn_backup_clearing(){ backupscount=$(find "${backupdir}/" -type f -name "*.tar.gz"|wc -l) # How many backups exceed maxbackups backupquotadiff=$((backupscount-maxbackups)) -#backupquotadiff=$(find ${backupdir}"/ -type f -printf '%T@ %p\n' | sort -rn | tail -n +"${maxbackups}" | cut -f2- -d" " | wc -l) backupsoudatedcount=$(find "${backupdir}"/ -type f -name "*.tar.gz" -mtime +"${maxbackupdays}"|wc -l) # If backup variables are set if [ -n "${maxbackupdays}" ]&&[ -n "${maxbackups}" ]; then # If anything can be cleared if [ "${backupquotadiff}" -gt "0" ]||[ "${backupsoudatedcount}" -gt "0" ]; then - # If maxbackups is used over maxbackupdays + # If maxbackups greater or equal than backupsoutdatedcount, then it is used over maxbackupdays if [ "${backupquotadiff}" -gt "${backupsoudatedcount}" ]||[ "${backupquotadiff}" -eq "${backupsoudatedcount}" ]; then # Display how many backups will be cleared echo "${backupquotadiff} backups will be clearned" - fn_print_info_nl "${backupquotadiff} backups than max ${maxbackups} will be cleared." - fn_script_log "${backupquotadiff} backups than max ${maxbackups} will be cleared" - echo "... Once this update is over" + fn_print_info_nl "${backupquotadiff} backups exceed max ${maxbackups} and will be cleared." + fn_script_log "${backupquotadiff} backups exceed max ${maxbackups} and will be cleared" + sleep 2 # Clear over quota backups - #find "${backupdir}"/ -type f -printf '%T@ %p\n' | sort -rn | tail "${backupquotadiff}" | cut -f2- -d" " + find "${backupdir}"/ -type f -name "*.tar.gz" -printf '%T@ %p\n' | sort -rn | tail -${backupquotadiff} | cut -f2- -d" " | xargs rm # If maxbackupdays is used over maxbackups elif [ "${backupquotadiff}" -lt "${backupsoudatedcount}" ]; then # Display how many backups will be cleared