From d40cb76a057c07bec17b4a075542406f56757cca Mon Sep 17 00:00:00 2001
From: Alexandre <44178713+alexbelgium@users.noreply.github.com>
Date: Sun, 16 Jan 2022 15:43:56 +0100
Subject: [PATCH] Update 99-run.sh

---
 fireflyiii/rootfs/etc/cont-init.d/99-run.sh | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/fireflyiii/rootfs/etc/cont-init.d/99-run.sh b/fireflyiii/rootfs/etc/cont-init.d/99-run.sh
index c75a8d49e..47bf5042c 100644
--- a/fireflyiii/rootfs/etc/cont-init.d/99-run.sh
+++ b/fireflyiii/rootfs/etc/cont-init.d/99-run.sh
@@ -81,12 +81,18 @@ mariadb_addon)
     fi
 
     # Use values
-    export DB_CONNECTION=mysql
-    export DB_HOST=$(bashio::services "mysql" "host") && bashio::log.blue "DB_HOST=$DB_HOST"
-    export DB_PORT=$(bashio::services "mysql" "port") && bashio::log.blue "DB_PORT=$DB_PORT"
-    export DB_DATABASE=firefly && bashio::log.blue "DB_DATABASE=$DB_DATABASE"
-    export DB_USERNAME=$(bashio::services "mysql" "username") && bashio::log.blue "DB_USERNAME=$DB_USERNAME"
-    export DB_PASSWORD=$(bashio::services "mysql" "password") && bashio::log.blue "DB_PASSWORD=$DB_PASSWORD"
+    DB_CONNECTION=mysql
+    DB_HOST=$(bashio::services "mysql" "host")
+    DB_PORT=$(bashio::services "mysql" "port")
+    DB_DATABASE=firefly
+    DB_USERNAME=$(bashio::services "mysql" "username") 
+    DB_PASSWORD=$(bashio::services "mysql" "password")
+    export DB_CONNECTION
+    export DB_HOST && bashio::log.blue "DB_HOST=$DB_HOST"
+    export DB_PORT && bashio::log.blue "DB_PORT=$DB_PORT"
+    export DB_DATABASE && bashio::log.blue "DB_DATABASE=$DB_DATABASE"
+    export DB_USERNAME && bashio::log.blue "DB_USERNAME=$DB_USERNAME"
+    export DB_PASSWORD && bashio::log.blue "DB_PASSWORD=$DB_PASSWORD"
 
     bashio::log.warning "Firefly-iii is using the Maria DB addon"
     bashio::log.warning "Please ensure this is included in your backups"