Fix multi world backups

This commit is contained in:
Marvin Altemeier 2020-05-01 15:28:37 +02:00
parent 70054ecdc2
commit 0529d08824

View file

@ -138,7 +138,7 @@ parse-file-timestamp () {
delete-backup () { delete-backup () {
local BACKUP=$2 local BACKUP=$2
local BACKUP_DIRECTORY=$1 local BACKUP_DIRECTORY=$1
rm $BACKUP_DIRECTORY/$BACKUP rm "$BACKUP_DIRECTORY/$BACKUP"
message-players "Deleted old backup" "$BACKUP" message-players "Deleted old backup" "$BACKUP"
} }
@ -146,10 +146,11 @@ delete-backup () {
delete-sequentially () { delete-sequentially () {
local BACKUP_DIRECTORY=$1 local BACKUP_DIRECTORY=$1
local WORLD_NAME=$2 local WORLD_NAME=$2
local BACKUPS=($(ls $BACKUP_DIRECTORY | grep $WORLD_NAME)) local BACKUPS=($(ls $BACKUP_DIRECTORY | grep "$WORLD_NAME\.tar$COMPRESSION_FILE_EXTENSION\$"))
echo "$BACKUPS"
while [[ $MAX_BACKUPS -ge 0 && ${#BACKUPS[@]} -gt $MAX_BACKUPS ]]; do while [[ $MAX_BACKUPS -ge 0 && ${#BACKUPS[@]} -gt $MAX_BACKUPS ]]; do
delete-backup BACKUP_DIRECTORY ${BACKUPS[0]} delete-backup $BACKUP_DIRECTORY ${BACKUPS[0]}
BACKUPS=($(ls $BACKUP_DIRECTORY | grep $WORLD_NAME)) BACKUPS=($(ls $BACKUP_DIRECTORY | grep "$WORLD_NAME\.tar$COMPRESSION_FILE_EXTENSION\$"))
done done
} }
@ -198,7 +199,7 @@ delete-thinning () {
fi fi
local CURRENT_INDEX=0 local CURRENT_INDEX=0
local BACKUPS=($(ls -r $BACKUP_DIRECTORY | grep $WORLD_NAME)) # List newest first local BACKUPS=($(ls -r $BACKUP_DIRECTORY | grep "$WORLD_NAME\.tar$COMPRESSION_FILE_EXTENSION\$")) # List newest first
for BLOCK_INDEX in ${!BLOCK_SIZES[@]}; do for BLOCK_INDEX in ${!BLOCK_SIZES[@]}; do
local BLOCK_SIZE=${BLOCK_SIZES[BLOCK_INDEX]} local BLOCK_SIZE=${BLOCK_SIZES[BLOCK_INDEX]}