From a8c3bb3fe059ec9ceca9e5686518fa0889917b91 Mon Sep 17 00:00:00 2001
From: Ducky <ducky@zio.sh>
Date: Wed, 2 Mar 2022 01:08:19 +0000
Subject: [PATCH] various changes

---
 opt/zio/bin/backup | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/opt/zio/bin/backup b/opt/zio/bin/backup
index 6b94f4c..4109db8 100755
--- a/opt/zio/bin/backup
+++ b/opt/zio/bin/backup
@@ -129,10 +129,10 @@ else
     [[ -f "$env_dir/script-post" ]] && post_script="$env_dir/script-post"
 
     if [[ -f "$env_dir/config" ]]; then
+        [[ ! -z $(get_prop "$env_dir/config" B2_ACCOUNT_ID) ]] && \
+            b2_account_id="$(get_prop "$env_dir/config" B2_ACCOUNT_ID)"
         [[ ! -z $(get_prop "$env_dir/config" B2_ACCOUNT_KEY) ]] && \
             b2_account_key="$(get_prop "$env_dir/config" B2_ACCOUNT_KEY)"
-        [[ ! -z $(get_prop "$env_dir/config" EXCLUDES) ]] && \
-            b2_account_id="$(get_prop "$env_dir/config" B2_ACCOUNT_ID)"
         [[ ! -z $(get_prop "$env_dir/config" EXCLUDES) ]] && \
             IFS=';' read -ra excludes <<< "$(get_prop "$env_dir/config" EXCLUDES)"
         [[ ! -z $(get_prop "$env_dir/config" PATHS) ]] && \
@@ -148,18 +148,18 @@ fi
 
 [[ -z $paths ]] && say_die "No paths specified. Aborting..."
 
-if [[ -z $b2_account_key ]]; then
-    say_die "B2_ACCOUNT_KEY (in $env_dir/config) not set. Aborting..."
-else
-    export B2_ACCOUNT_KEY="$b2_account_key"
-fi
-
 if [[ -z $b2_account_id ]]; then
     say_die "B2_ACCOUNT_ID (in $env_dir/config) not set. Aborting..."
 else
     export B2_ACCOUNT_ID="$b2_account_ID"
 fi
 
+if [[ -z $b2_account_key ]]; then
+    say_die "B2_ACCOUNT_KEY (in $env_dir/config) not set. Aborting..."
+else
+    export B2_ACCOUNT_KEY="$b2_account_key"
+fi
+
 if [[ ! -f $pre_script_file ]]; then
     say_do "Executing pre-backup script..."
     . $pre_script_file