Minor code refactor

dev
hk 2017-09-16 13:57:18 +02:00
parent 03c40c723d
commit 53f91f0f9e
1 changed files with 4 additions and 16 deletions

View File

@ -52,10 +52,7 @@ borg_backup () {
) )
fi fi
if ${DRY_RUN}; then ${DRY_RUN} && BORG_CREATE_ARGS+=( --dry-run )
BORG_CREATE_ARGS+=( --dry-run )
fi
${NICE} ${BORG} create \ ${NICE} ${BORG} create \
"${BORG_CREATE_ARGS[@]}" \ "${BORG_CREATE_ARGS[@]}" \
"${BORG_REPO}"::"{hostname}-$(date -u +'%Y%m%dT%H%M%SZ')" \ "${BORG_REPO}"::"{hostname}-$(date -u +'%Y%m%dT%H%M%SZ')" \
@ -72,10 +69,7 @@ borg_prune () {
) )
fi fi
if ${DRY_RUN}; then ${DRY_RUN} && BORG_PRUNE_ARGS+=( --dry-run )
BORG_PRUNE_ARGS+=( --dry-run )
fi
${NICE} ${BORG} prune \ ${NICE} ${BORG} prune \
"${BORG_PRUNE_ARGS[@]}" \ "${BORG_PRUNE_ARGS[@]}" \
--prefix "{hostname}-" \ --prefix "{hostname}-" \
@ -99,10 +93,7 @@ borg_verify () {
borg_delete_checkpoints () { borg_delete_checkpoints () {
local DELETE_ARGS=() local DELETE_ARGS=()
if ${DRY_RUN}; then ${DRY_RUN} && DELETE_ARGS+=( --dry-run )
DELETE_ARGS+=( --dry-run )
fi
${BORG} list "${BORG_REPO}" \ ${BORG} list "${BORG_REPO}" \
| { grep .checkpoint || true; } \ | { grep .checkpoint || true; } \
| cut -d ' ' -f 1 \ | cut -d ' ' -f 1 \
@ -244,10 +235,7 @@ MODE="${1}"
echo "Loading config from ${CONFIG}" echo "Loading config from ${CONFIG}"
source "${CONFIG}" || exit 1 source "${CONFIG}" || exit 1
export BORG_PASSPHRASE export BORG_PASSPHRASE
! ${USE_NICE} && NICE=""
if ! ${USE_NICE}; then
NICE=""
fi
LOCKFILE="${LOCKDIR}/$(echo -n "${BORG_REPO}" | md5sum | cut -d ' ' -f 1).lock" LOCKFILE="${LOCKDIR}/$(echo -n "${BORG_REPO}" | md5sum | cut -d ' ' -f 1).lock"
mkdir -p "${LOCKDIR}" mkdir -p "${LOCKDIR}"