diff --git a/bin/b2-linux b/bin/b2-linux index f43039f..e331abb 100755 Binary files a/bin/b2-linux and b/bin/b2-linux differ diff --git a/bin/backuptool b/bin/backuptool index 878d918..175f911 100755 --- a/bin/backuptool +++ b/bin/backuptool @@ -3,6 +3,9 @@ # Federated Backup / Restore Tool to B2 Backblaze . /federated/lib/functions.sh +B2="$(command b2)" +[ -z "$B2" ] && B2=/federated/bin/b2-linux + usage() { cat << EOF Backup / Restore for Backblaze @@ -28,7 +31,7 @@ exit 2; } createbucket() { if [ ! -f "/federated/bin/.b2init" ]; then - B2_APPLICATION_KEY_ID="$B2_APPLICATION_KEY_ID" B2_APPLICATION_KEY="$B2_APPLICATION_KEY" /federated/bin/b2-linux create_bucket $UUID allPrivate + B2_APPLICATION_KEY_ID="$B2_APPLICATION_KEY_ID" B2_APPLICATION_KEY="$B2_APPLICATION_KEY" $B2 bucket create $UUID allPrivate echo "$UUID" > /federated/bin/.b2init fi } @@ -297,7 +300,7 @@ listbackup_nfsmounts() { delete_backup() { echo "* Deleting backup files for /federated/apps/$SERVICE.." mkdir -p /federated/tmp/empty - cd /federated/tmp/empty && B2_APPLICATION_KEY_ID="$B2_APPLICATION_KEY_ID" B2_APPLICATION_KEY="$B2_APPLICATION_KEY" /federated/bin/b2-linux sync --allowEmptySource --delete . b2://fed-customers/$UUID/federated/apps/$SERVICE/ + cd /federated/tmp/empty && B2_APPLICATION_KEY_ID="$B2_APPLICATION_KEY_ID" B2_APPLICATION_KEY="$B2_APPLICATION_KEY" $B2 sync --allow-empty-source --delete . b2://fed-customers/$UUID/federated/apps/$SERVICE/ [ $? -ne 0 ] && failcheck "* Couldn't delete files" cd /federated && rm -rf /federated/tmp/empty }