Tabs
This commit is contained in:
+24
-24
@@ -96,10 +96,10 @@ fn_expire_backups() {
|
|||||||
local current_timestamp=$EPOCH
|
local current_timestamp=$EPOCH
|
||||||
local last_kept_timestamp=9999999999
|
local last_kept_timestamp=9999999999
|
||||||
|
|
||||||
# we will keep requested backup
|
# we will keep requested backup
|
||||||
backup_to_keep="$1"
|
backup_to_keep="$1"
|
||||||
# we will also keep the oldest backup
|
# we will also keep the oldest backup
|
||||||
oldest_backup_to_keep="$(fn_find_backups | sort | sed -n '1p')"
|
oldest_backup_to_keep="$(fn_find_backups | sort | sed -n '1p')"
|
||||||
|
|
||||||
# Process each backup dir from the oldest to the most recent
|
# Process each backup dir from the oldest to the most recent
|
||||||
for backup_dir in $(fn_find_backups | sort); do
|
for backup_dir in $(fn_find_backups | sort); do
|
||||||
@@ -113,17 +113,17 @@ fn_expire_backups() {
|
|||||||
continue
|
continue
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "$backup_dir" == "$backup_to_keep" ]; then
|
if [ "$backup_dir" == "$backup_to_keep" ]; then
|
||||||
# this is the latest backup requsted to be kept. We can finish pruning
|
# this is the latest backup requsted to be kept. We can finish pruning
|
||||||
break
|
break
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "$backup_dir" == "$oldest_backup_to_keep" ]; then
|
if [ "$backup_dir" == "$oldest_backup_to_keep" ]; then
|
||||||
# We dont't want to delete the oldest backup. It becomes first "last kept" backup
|
# We dont't want to delete the oldest backup. It becomes first "last kept" backup
|
||||||
last_kept_timestamp=$backup_timestamp
|
last_kept_timestamp=$backup_timestamp
|
||||||
# As we keep it we can skip processing it and go to the next oldest one in the loop
|
# As we keep it we can skip processing it and go to the next oldest one in the loop
|
||||||
continue
|
continue
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Find which strategy token applies to this particular backup
|
# Find which strategy token applies to this particular backup
|
||||||
for strategy_token in $(echo $EXPIRATION_STRATEGY | tr " " "\n" | sort -r -n); do
|
for strategy_token in $(echo $EXPIRATION_STRATEGY | tr " " "\n" | sort -r -n); do
|
||||||
@@ -423,9 +423,9 @@ if [ -n "$(fn_find "$INPROGRESS_FILE")" ]; then
|
|||||||
elif [[ "$OSTYPE" == "netbsd"* ]]; then
|
elif [[ "$OSTYPE" == "netbsd"* ]]; then
|
||||||
RUNNINGPID="$(fn_run_cmd "cat $INPROGRESS_FILE")"
|
RUNNINGPID="$(fn_run_cmd "cat $INPROGRESS_FILE")"
|
||||||
if ps -axp "$RUNNINGPID" -o "command" | grep "$APPNAME" > /dev/null; then
|
if ps -axp "$RUNNINGPID" -o "command" | grep "$APPNAME" > /dev/null; then
|
||||||
fn_log_error "Previous backup task is still active - aborting."
|
fn_log_error "Previous backup task is still active - aborting."
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
RUNNINGPID="$(fn_run_cmd "cat $INPROGRESS_FILE")"
|
RUNNINGPID="$(fn_run_cmd "cat $INPROGRESS_FILE")"
|
||||||
if [ "$RUNNINGPID" = "$(pgrep -o -f "$APPNAME")" ]; then
|
if [ "$RUNNINGPID" = "$(pgrep -o -f "$APPNAME")" ]; then
|
||||||
@@ -480,13 +480,13 @@ while : ; do
|
|||||||
# Purge certain old backups before beginning new backup.
|
# Purge certain old backups before beginning new backup.
|
||||||
# -----------------------------------------------------------------------------
|
# -----------------------------------------------------------------------------
|
||||||
|
|
||||||
if [ -n "$PREVIOUS_DEST" ]; then
|
if [ -n "$PREVIOUS_DEST" ]; then
|
||||||
# regardless of expiry strategy keep backup used for --link-dest
|
# regardless of expiry strategy keep backup used for --link-dest
|
||||||
fn_expire_backups "$PREVIOUS_DEST"
|
fn_expire_backups "$PREVIOUS_DEST"
|
||||||
else
|
else
|
||||||
# keep latest backup
|
# keep latest backup
|
||||||
fn_expire_backups "$DEST"
|
fn_expire_backups "$DEST"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# -----------------------------------------------------------------------------
|
# -----------------------------------------------------------------------------
|
||||||
# Start backup
|
# Start backup
|
||||||
|
|||||||
Reference in New Issue
Block a user