From 1304280e7b128c2f91b2daaff7b95fe102c4671c Mon Sep 17 00:00:00 2001
From: hk <hkbakke@gmail.com>
Date: Wed, 31 Jan 2018 19:45:46 +0100
Subject: [PATCH] Minor refactor

---
 src/borgwrapper | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/borgwrapper b/src/borgwrapper
index 6c195d3..0706287 100755
--- a/src/borgwrapper
+++ b/src/borgwrapper
@@ -201,9 +201,10 @@ MODE="${1}"
 
 echo "Loading config from ${CONFIG}"
 source "${CONFIG}" || exit 1
+
+# Set some defaults
 [[ -n ${BORG_RSH} ]] || BORG_RSH="ssh"
-export BORG_PASSPHRASE
-export BORG_RSH
+[[ -n ${BWLIMIT} ]] || BWLIMIT="0"
 
 LOCKFILE="${LOCKDIR}/$(echo -n "${BORG_REPO}" | md5sum | cut -d ' ' -f 1).lock"
 mkdir -p "${LOCKDIR}"
@@ -216,8 +217,12 @@ mkdir -p "${LOCKDIR}"
     trap 'error_handler ${LINENO} $?' ERR INT TERM
     set -o errtrace -o pipefail
 
+    # These are needed everywhere
+    export BORG_PASSPHRASE
+    export BORG_RSH
+
     # Enforce bandwidth limit if set
-    [[ -n ${BWLIMIT} ]] && [[ ${BWLIMIT} != "0" ]] && limit_bw
+    [[ ${BWLIMIT} != "0" ]] && limit_bw
 
     if [[ ${MODE} != "exec" ]] && [[ $# -gt 1 ]]; then
         print_usage