From 6f54b140462d7d1e624a3bddd05b771beb101bd3 Mon Sep 17 00:00:00 2001 From: ttionya Date: Wed, 24 Feb 2021 00:10:22 +0800 Subject: [PATCH] fix: fix array problem --- scripts/backup.sh | 6 +++--- scripts/entrypoint.sh | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/backup.sh b/scripts/backup.sh index 35f0835..4817931 100644 --- a/scripts/backup.sh +++ b/scripts/backup.sh @@ -7,7 +7,7 @@ function clear_dir() { } function backup_init() { - NOW=$(date +"${BACKUP_FILE_DATE_FORMAT}") + NOW="$(date +"${BACKUP_FILE_DATE_FORMAT}")" # backup bitwarden_rs database file BACKUP_FILE_DB="${BACKUP_DIR}/db.${NOW}.sqlite3" # backup bitwarden_rs config file @@ -32,7 +32,7 @@ function backup_config() { color blue "backup bitwarden_rs config" if [[ -f "${DATA_CONFIG}" ]]; then - cp -f ${DATA_DIR}/config.json ${BACKUP_FILE_CONFIG} + cp -f "${DATA_DIR}/config.json" "${BACKUP_FILE_CONFIG}" else color yellow "not found bitwarden_rs config, skipping" fi @@ -110,7 +110,7 @@ function clear_history() { if [[ "${BACKUP_KEEP_DAYS}" -gt 0 ]]; then color blue "delete ${BACKUP_KEEP_DAYS} days ago backup files" - local RCLONE_DELETE_LIST=($(rclone lsf "${RCLONE_REMOTE}" --min-age ${BACKUP_KEEP_DAYS}d)) + mapfile -t RCLONE_DELETE_LIST < <(rclone lsf "${RCLONE_REMOTE}" --min-age "${BACKUP_KEEP_DAYS}d") for RCLONE_DELETE_FILE in "${RCLONE_DELETE_LIST[@]}" do diff --git a/scripts/entrypoint.sh b/scripts/entrypoint.sh index 5eda3d8..a11d3cb 100644 --- a/scripts/entrypoint.sh +++ b/scripts/entrypoint.sh @@ -45,7 +45,7 @@ function configure_timezone() { function configure_cron() { local FIND_CRON_COUNT=$(crontab -l | grep -c 'backup.sh') if [[ ${FIND_CRON_COUNT} -eq 0 ]]; then - echo "${CRON} sh /app/backup.sh > /dev/stdout" >> /etc/crontabs/root + echo "${CRON} bash /app/backup.sh > /dev/stdout" >> /etc/crontabs/root fi }