From fd1d95090e6b8b05b80290b5d63a569644db2ad3 Mon Sep 17 00:00:00 2001
From: "dave@tiredofit.ca" <dave@tiredofit.ca>
Date: Wed, 3 May 2023 12:13:29 -0700
Subject: [PATCH] Release 3.9.1 - See CHANGELOG.md

---
 CHANGELOG.md                          | 7 +++++++
 install/assets/functions/10-db-backup | 6 +++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4d2a4ae..657088f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,10 @@
+## 3.9.1 2023-05-03 <dave at tiredofit dot ca>
+
+   ### Changed
+      - Properly allow multiple _FILE environment variables to execute solving an issue with MySQL backups
+      - Fix _FILE functionality for DB_NAME variable
+
+
 ## 3.9.0 2023-04-26 <dave at tiredofit dot ca>
 
    ### Added
diff --git a/install/assets/functions/10-db-backup b/install/assets/functions/10-db-backup
index a1d3ba0..9046fa7 100644
--- a/install/assets/functions/10-db-backup
+++ b/install/assets/functions/10-db-backup
@@ -4,9 +4,11 @@ bootstrap_variables() {
     sanity_var DB_TYPE "Set appropriate DB_TYPE"
     transform_file_var \
                         DB_HOST \
+                        DB_NAME \
                         DB_PORT \
                         DB_USER \
                         DB_PASS
+
     case "${DB_TYPE,,}" in
         couch* )
             dbtype=couch
@@ -52,7 +54,8 @@ bootstrap_variables() {
             dbtype=mysql
             DB_PORT=${DB_PORT:-3306}
             sanity_var DB_NAME "Database Name to backup. Multiple seperated by commas"
-                        [[ ( -n "${DB_PASS}" ) ]] && export MYSQL_PWD=${DB_PASS}
+            transform_file_var DB_PASS
+            if [ -n "${DB_PASS}" ] ; then export MYSQL_PWD=${DB_PASS} ; fi
             if var_true "${MYSQL_ENABLE_TLS}" ; then
                 if [ -n "${MYSQL_TLS_CA_FILE}" ] ; then
                     mysql_tls_args="--ssl_ca=${MYSQL_TLS_CA_FILE}"
@@ -445,6 +448,7 @@ check_availability() {
             ;;
             "mysql" )
                 counter=0
+                transform_file_var DB_PASS
                 export MYSQL_PWD=${DB_PASS}
                 while ! (mysqladmin -u"${DB_USER}" -P"${DB_PORT}" -h"${DB_HOST}" ${mysql_tls_args} status > /dev/null 2>&1) ; do
                     sleep 5