Minor refactor

dev
hk 2018-01-31 19:45:46 +01:00
parent 67db0abce1
commit 1304280e7b
1 changed files with 8 additions and 3 deletions

View File

@ -201,9 +201,10 @@ MODE="${1}"
echo "Loading config from ${CONFIG}" echo "Loading config from ${CONFIG}"
source "${CONFIG}" || exit 1 source "${CONFIG}" || exit 1
# Set some defaults
[[ -n ${BORG_RSH} ]] || BORG_RSH="ssh" [[ -n ${BORG_RSH} ]] || BORG_RSH="ssh"
export BORG_PASSPHRASE [[ -n ${BWLIMIT} ]] || BWLIMIT="0"
export BORG_RSH
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}"
@ -216,8 +217,12 @@ mkdir -p "${LOCKDIR}"
trap 'error_handler ${LINENO} $?' ERR INT TERM trap 'error_handler ${LINENO} $?' ERR INT TERM
set -o errtrace -o pipefail set -o errtrace -o pipefail
# These are needed everywhere
export BORG_PASSPHRASE
export BORG_RSH
# Enforce bandwidth limit if set # Enforce bandwidth limit if set
[[ -n ${BWLIMIT} ]] && [[ ${BWLIMIT} != "0" ]] && limit_bw [[ ${BWLIMIT} != "0" ]] && limit_bw
if [[ ${MODE} != "exec" ]] && [[ $# -gt 1 ]]; then if [[ ${MODE} != "exec" ]] && [[ $# -gt 1 ]]; then
print_usage print_usage