Release 4.0.9 - See CHANGELOG.md

CHANGELOG.md

@@ -1,9 +1,15 @@
+## 4.0.9 2023-11-11 <dave at tiredofit dot ca>
+
+   ### Changed
+      - Fix issue with quotes being wrapped around _PASS variables
+
+
 ## 4.0.8 2023-11-11 <dave at tiredofit dot ca>
 
    ### Changed
       - Tidy up file_encryption() routines
-      - Change environment variable _ENCRYPTION_PUBKEY to _ENCRYPTION_PUBLIC_KEY
+      - Change environment variable _ENCRYPT_PUBKEY to _ENCRYPT_PUBLIC_KEY
-      - Add new environment variable _ENCRYPTION_PRIVATE_KEY
+      - Add new environment variable _ENCRYPT_PRIVATE_KEY
 
 
 ## 4.0.7 2023-11-11 <dave at tiredofit dot ca>

install/assets/functions/10-db-backup

@@ -153,6 +153,11 @@ bootstrap_variables() {
         fi
         ##
 
+        if grep -qo ".*_PASS='.*'" "${backup_instance_vars}"; then
+            print_debug "[bootstrap_variables] [backup_init] Found _PASS variable with quotes"
+            sed -i "s|_PASS='\(.*\)'|_PASS=\1|g" "${backup_instance_vars}"
+        fi
+
         transform_backup_instance_variable() {
             if grep -q "^DB${1}_${2}=" "${backup_instance_vars}" && [ "$(grep "^DB${1}_${2}=" "${backup_instance_vars}" | cut -d = -f2)" != "unset" ]; then
                 export "$3"="$(grep "^DB${1}_${2}=" "${backup_instance_vars}" | cut -d = -f2)"
@@ -1183,7 +1188,7 @@ EOF
 }
 
 ctrl_c() {
-    sed -i "/^{{BACKUP_NUMBER}}/d" /tmp/.container/db-backup-backups
+    sed -i "/^${backup_instance_number}/d" /tmp/.container/db-backup-backups
     symlink_log
     print_warn "User aborted"
     exit
@@ -1738,7 +1743,7 @@ process_limiter() {
 }
 
 run_as_user() {
-    sudo -u "${DBBACKUP_USER}" $@
+    sudo -Eu "${DBBACKUP_USER}" $@
 }
 
 setup_mode() {