From fe9ab8e045ffec601862c3aba6590eed54d911db Mon Sep 17 00:00:00 2001 From: jmqm Date: Thu, 15 Jul 2021 14:26:59 -0500 Subject: [PATCH] Cron job fixes - Previously, changes in CRON_TIME will apply but the previous CRON_TIME will not be removed. - Jobs are now cleared when ran every time. - Backup and delete scripts are now added when ran every time. - An echo is added to signify that parameters, changed or not, are acknowledged and applied. --- entrypoint.sh | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/entrypoint.sh b/entrypoint.sh index 92b304d..72e9a7d 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -11,15 +11,18 @@ if [ "$1" = "manual" ]; then exit 0 fi -# Create cron jobs. -if [ "$(id -u)" -eq 0 ] && [ "$(grep -c "$BACKUP_CMD" "$CRONFILE")" -eq 0 ]; then +# Create cron jobs if root. +if [ "$(id -u)" -eq 0 ]; then + # Clear cron jobs. + echo "" | crontab - + echo "[INFO] Cron jobs cleared." + # Add backup script to cron jobs. (crontab -l 2>/dev/null; echo "$CRON_TIME $BACKUP_CMD >> $LOGS_FILE 2>&1") | crontab - echo "[INFO] Added backup script to cron jobs." - # Check if $DELETE_AFTER is not null and is greater than 0. - # If so, add it to cron jobs. - if [ -n "$DELETE_AFTER" ] && [[ "$DELETE_AFTER" -gt 0 ]]; then + # Add delete script to cron jobs if DELETE_AFTER is not null and is greater than 0. + if [ -n "$DELETE_AFTER" ] && [ "$DELETE_AFTER" -gt 0 ]; then (crontab -l 2>/dev/null; echo "$CRON_TIME $DELETE_CMD >> $LOGS_FILE 2>&1") | crontab - echo "[INFO] Added delete script to cron jobs." fi