* MOD: cleanup

Signed-off-by: Uwe Hermann <uh@uleenucks.de>

vaultwarden-backup/app/backup.sh

@@ -1,5 +1,6 @@
 #!/bin/bash
 
+# shellcheck source=/dev/null
 . /app/includes.sh
 
 function clear_dir() {
@@ -25,8 +26,7 @@ function backup_init() {
 function backup_db_postgresql() {
   echo "backup vaultwarden postgresql database"
 
-  pg_dump -Fc -h "${POSTGRES_HOST}" -p "${POSTGRES_PORT}" -d "${POSTGRES_DB}" -U "${POSTGRES_USER}" -f "${BACKUP_FILE_DB_POSTGRESQL}"
-  if [[ $? != 0 ]]; then
+  if ! pg_dump -Fc -h "${POSTGRES_HOST}" -p "${POSTGRES_PORT}" -d "${POSTGRES_DB}" -U "${POSTGRES_USER}" -f "${BACKUP_FILE_DB_POSTGRESQL}"
     echo "backup vaultwarden postgresql database failed"
 
     exit 1
@@ -46,8 +46,10 @@ function backup_config() {
 function backup_rsakey() {
   echo "backup vaultwarden rsakey"
 
-  local FIND_RSAKEY=$(find "${DATA_RSAKEY_DIRNAME}" -name "${DATA_RSAKEY_BASENAME}*" | xargs -I {} basename {})
-  local FIND_RSAKEY_COUNT=$(echo "${FIND_RSAKEY}" | wc -l)
+  local FIND_RSAKEY
+  FIND_RSAKEY=$(find "${DATA_RSAKEY_DIRNAME}" -name "${DATA_RSAKEY_BASENAME}*" -exec basename {} +)
+  local FIND_RSAKEY_COUNT
+  FIND_RSAKEY_COUNT=$(echo "${FIND_RSAKEY}" | wc -l)
 
   if [[ "${FIND_RSAKEY_COUNT}" -gt 0 ]]; then
     echo "${FIND_RSAKEY}" | tar -c -C "${DATA_RSAKEY_DIRNAME}" -f "${BACKUP_FILE_RSAKEY}" -T -

vaultwarden-backup/app/entrypoint.sh

@@ -1,5 +1,6 @@
 #!/bin/bash
 
+# shellcheck source=/dev/null
 . /app/includes.sh
 
 # restore
@@ -14,7 +15,8 @@ if [[ "$1" == "restore" ]]; then
 fi
 
 function configure_cron() {
-  local FIND_CRON_COUNT="$(grep -c 'backup.sh' "${CRON_CONFIG_FILE}" 2> /dev/null)"
+  local FIND_CRON_COUNT
+  FIND_CRON_COUNT="$(grep -c 'backup.sh' "${CRON_CONFIG_FILE}" 2> /dev/null)"
   if [[ "${FIND_CRON_COUNT}" -eq 0 ]]; then
     echo "${CRON} bash /app/backup.sh" >> "${CRON_CONFIG_FILE}"
   fi