bryan
/
borgwrapper
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix behaviour when hooks are not set

dev
hk 2017-06-05 02:44:00 +02:00
parent a48212db7e
commit 213c235e54
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/borgwrapper.sh
View File

@ -93,19 +93,19 @@ borg_exec () {
} }
pre_backup_cmd () { pre_backup_cmd () {
[[ -n ${PRE_BACKUP_CMD} ]] || return [[ -n ${PRE_BACKUP_CMD} ]] || return 0
echo "Running pre backup command: ${PRE_BACKUP_CMD[@]}" echo "Running pre backup command: ${PRE_BACKUP_CMD[@]}"
"${PRE_BACKUP_CMD[@]}" "${PRE_BACKUP_CMD[@]}"
} }
post_backup_cmd () { post_backup_cmd () {
[[ -n ${POST_BACKUP_CMD} ]] || return [[ -n ${POST_BACKUP_CMD} ]] || return 0
echo "Running post backup command: ${POST_BACKUP_CMD[@]}" echo "Running post backup command: ${POST_BACKUP_CMD[@]}"
"${POST_BACKUP_CMD[@]}" "${POST_BACKUP_CMD[@]}"
} }
post_verify_cmd () { post_verify_cmd () {
[[ -n ${POST_VERIFY_CMD} ]] || return [[ -n ${POST_VERIFY_CMD} ]] || return 0
echo "Running post verify command: ${POST_VERIFY_CMD[@]}" echo "Running post verify command: ${POST_VERIFY_CMD[@]}"
"${POST_VERIFY_CMD[@]}" "${POST_VERIFY_CMD[@]}"
} }
@ -131,6 +131,11 @@ set -o errtrace -o pipefail
# Default options # Default options
CONFIG="/etc/borgwrapper/config.sh" CONFIG="/etc/borgwrapper/config.sh"
LOCKFILE="/var/lock/borgwrapper.lock"
BORG="/usr/bin/borg"
PRE_BACKUP_CMD=()
POST_BACKUP_CMD=()
POST_VERIFY_CMD=()
while getopts ":c:" OPT; do while getopts ":c:" OPT; do
case ${OPT} in case ${OPT} in
@ -150,10 +155,6 @@ MODE="${1}"
source "${CONFIG}" || exit 1 source "${CONFIG}" || exit 1
export BORG_PASSPHRASE export BORG_PASSPHRASE
# Global defaults
[[ -z ${LOCKFILE} ]] && LOCKFILE="/var/lock/borgwrapper.lock"
[[ -z ${BORG} ]] && BORG="/usr/bin/borg"
# Ensure this is the only instance of borgwrapper running # Ensure this is the only instance of borgwrapper running
[[ "${FLOCKER}" != "$0" ]] && exec env FLOCKER="$0" flock -en "${LOCKFILE}" "$0" "$@" || true [[ "${FLOCKER}" != "$0" ]] && exec env FLOCKER="$0" flock -en "${LOCKFILE}" "$0" "$@" || true