Rearrange function definitions.

This commit is contained in:
Robert Bruce Park
2013-11-13 10:21:47 -08:00
parent a67efdd0f1
commit 8bb5b3f265
+14 -10
View File
@@ -28,13 +28,26 @@ fn_terminate_script() {
trap 'fn_terminate_script' SIGINT trap 'fn_terminate_script' SIGINT
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
# Source and destination information # Small utility functions for reducing code duplication
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
fn_parse_date() { fn_parse_date() {
date -d "${1:0:10} ${1:11:2}:${1:13:2}:${1:15:2}" +%s date -d "${1:0:10} ${1:11:2}:${1:13:2}:${1:15:2}" +%s
} }
fn_find_backups() {
find "$DEST_FOLDER" -type d -name "$BACKUP_FOLDER_PATTERN" -prune
}
fn_expire_backup() {
fn_log_info "Expiring $1"
echo rm -rf -- "$1"
}
# -----------------------------------------------------------------------------
# Source and destination information
# -----------------------------------------------------------------------------
SRC_FOLDER=${1%/} SRC_FOLDER=${1%/}
DEST_FOLDER=${2%/} DEST_FOLDER=${2%/}
EXCLUSION_FILE=$3 EXCLUSION_FILE=$3
@@ -78,10 +91,6 @@ fi
# Setup additional variables # Setup additional variables
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
fn_find_backups() {
find "$DEST_FOLDER" -type d -name "$BACKUP_FOLDER_PATTERN" -prune
}
export IFS=$'\n' # Better for handling spaces in filenames. export IFS=$'\n' # Better for handling spaces in filenames.
BACKUP_FOLDER_PATTERN=????-??-??-?????? BACKUP_FOLDER_PATTERN=????-??-??-??????
NOW=$(date +"%Y-%m-%d-%H%M%S") NOW=$(date +"%Y-%m-%d-%H%M%S")
@@ -122,11 +131,6 @@ if [ -f "$INPROGRESS_FILE" ]; then
fi fi
fi fi
fn_expire_backup() {
fn_log_info "Expiring $1"
echo rm -rf -- "$1"
}
# Run in a loop to handle the "No space left on device" logic. # Run in a loop to handle the "No space left on device" logic.
while [ "1" ]; do while [ "1" ]; do