From 674a98fcd8b0abe4fa4b08888255097885250171 Mon Sep 17 00:00:00 2001 From: "dave@tiredofit.ca" Date: Mon, 20 Nov 2023 15:26:21 -0800 Subject: [PATCH] Release 4.0.19 - See CHANGELOG.md --- CHANGELOG.md | 6 +++++ Dockerfile | 2 +- install/assets/dbbackup/template-dbbackup/run | 3 +++ install/assets/functions/10-db-backup | 26 +++++++++++++------ 4 files changed, 28 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 657ddca..dd845b7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +## 4.0.19 2023-11-20 + + ### Changed + - Make adjustments to cron scheduling feature to be able to handle whitespace properly" + + ## 4.0.18 2023-11-18 ### Changed diff --git a/Dockerfile b/Dockerfile index 002ee22..72c37a4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -76,7 +76,7 @@ RUN source /assets/functions/00-container && \ *) sleep 0.1 ;; \ esac; \ \ - if [ $mssql = "true" ] ; then curl -O https://download.microsoft.com/download/3/5/5/355d7943-a338-41a7-858d-53b259ea33f5/msodbcsql18_${MSODBC_VERSION}_${mssql_arch}.apk ; curl -O https://download.microsoft.com/download/3/5/5/355d7943-a338-41a7-858d-53b259ea33f5/mssql-tools18_${MSSQL_VERSION}_${mssql_arch}.apk ; ls -l ; echo y | apk add --allow-untrusted msodbcsql18_${MSODBC_VERSION}_${mssql_arch}.apk mssql-tools18_${MSSQL_VERSION}_${mssql_arch}.apk ; else echo >&2 "Detected non x86_64 or ARM64 build variant, skipping MSSQL installation" ; fi; \ + if [ $mssql = "true" ] ; then curl -O https://download.microsoft.com/download/3/5/5/355d7943-a338-41a7-858d-53b259ea33f5/msodbcsql18_${MSODBC_VERSION}_${mssql_arch}.apk ; curl -O https://download.microsoft.com/download/3/5/5/355d7943-a338-41a7-858d-53b259ea33f5/mssql-tools18_${MSSQL_VERSION}_${mssql_arch}.apk ; echo y | apk add --allow-untrusted msodbcsql18_${MSODBC_VERSION}_${mssql_arch}.apk mssql-tools18_${MSSQL_VERSION}_${mssql_arch}.apk ; else echo >&2 "Detected non x86_64 or ARM64 build variant, skipping MSSQL installation" ; fi; \ if [ $influx2 = "true" ] ; then curl -sSL https://dl.influxdata.com/influxdb/releases/influxdb2-client-${INFLUX2_CLIENT_VERSION}-linux-${influx_arch}.tar.gz | tar xvfz - --strip=1 -C /usr/src/ ; chmod +x /usr/src/influx ; mv /usr/src/influx /usr/sbin/ ; else echo >&2 "Unable to build Influx 2 on this system" ; fi ; \ clone_git_repo https://github.com/aws/aws-cli "${AWS_CLI_VERSION}" && \ python3 setup.py install --prefix=/usr && \ diff --git a/install/assets/dbbackup/template-dbbackup/run b/install/assets/dbbackup/template-dbbackup/run index 8f6dc38..c28553b 100755 --- a/install/assets/dbbackup/template-dbbackup/run +++ b/install/assets/dbbackup/template-dbbackup/run @@ -34,9 +34,12 @@ else elif [[ "${backup_job_backup_begin}" =~ ([0-9]{4})-([0-9]{2})-([0-9]{2})[[:space:]]([0-9]{2}):([0-9]{2}):([0-9]{2}) ]]; then print_debug "BACKUP_BEGIN is a full date timestamp" timer datetime + #elif echo "${backup_job_backup_begin//\*/#}" | grep -qP "^(.*((\d+,)+\d+|(\d+(\/|-)\d+)|\d+|#) ?){5}$" ; then # Allow slashes, yet not supporting advanced cron yet elif echo "${backup_job_backup_begin//\*/#}" | grep -qP "^(((\d+,)+\d+|(\d+(\/|-)\d+)|\d+|#) ?){5}$" ; then print_debug "BACKUP_BEGIN is a cron expression" time_last_run=$(date +"%s") + backup_job_backup_begin=${backup_job_backup_begin//\"/} + backup_job_backup_begin=${backup_job_backup_begin//\'/} timer cron "${backup_job_backup_begin}" "${time_current}" "${time_last_run}" else print_error "_BACKUP_BEGIN is invalid - Unable to perform scheduling" diff --git a/install/assets/functions/10-db-backup b/install/assets/functions/10-db-backup index 14d4ab3..84fedf9 100644 --- a/install/assets/functions/10-db-backup +++ b/install/assets/functions/10-db-backup @@ -1843,7 +1843,7 @@ timer() { if [ "${expression_step}" != "${expression}" ]; then for step in ${validate_temp}; do if [ $(( ( step - expression_start ) % expression_step )) -eq 0 ]; then - validate_all="$validate_all ${step}" + validate_all="${validate_all} ${step}" fi done else @@ -1853,13 +1853,14 @@ timer() { validate_all=$(echo "${validate_all}" | tr ' ' '\n' | sort -n -u | tr '\n' ' ') for entry in $validate_all; do - if [ "${entry}" -ge "${3}" ]; then + if [ ${entry} -ge ${3} ]; then echo "${entry}" return 0 fi done - echo "${validate_all%% *}" + echo "${validate_all// /}" + #echo "${validate_all%% *}" } local cron_compare="${3}" @@ -1878,7 +1879,10 @@ timer() { local cron_minute="$(echo -n "${2}" | awk '{print $1}')" local cron_hour="$(echo -n "${2}" | awk '{print $2}')" local cron_day_of_month="$(echo -n "${2}" | awk '{print $3}')" - local cron_month="$(echo -n "${2}" | awk '{print $4}')"Generating + local cron_month="$(echo -n "${2}" | awk '{print $4}')" + local cron_day_of_week="$(echo -n "${2}" | awk '{print $5}')" + + local cron_next_minute="$(date --date=@"${cron_compare}" +"%-M")" local cron_next_hour="$(date --date=@"${cron_compare}" +"%-H")" local cron_next_day_of_month="$(date --date=@"${cron_compare}" +"%-d")" local cron_next_month="$(date --date=@"${cron_compare}" +"%-m")" @@ -1887,8 +1891,10 @@ timer() { local cron_next_year="$(date --date=@"${cron_compare}" +"%-Y")" local cron_next= + local cron_parsed=1 - while [ "$cron_parsed" != "0" ]; do + while [ "${cron_parsed}" != "0" ]; do + print_debug "[timer] [cron] Parse Minute" cron_next=$(parse_expression "${cron_minute}" 59 "${cron_next_minute}") if [ "${cron_next}" != "${cron_next_minute}" ]; then if [ "${cron_next_minute}" -gt "${cron_next}" ]; then @@ -1898,20 +1904,22 @@ timer() { cron_next_minute="${cron_next}" fi + print_debug "[timer] [cron] Parse Hour" cron_next=$(parse_expression "${cron_hour}" 23 "${cron_next_hour}") if [ "${cron_next}" != "${cron_next_hour}" ]; then if [ "${cron_next_hour}" -gt "${cron_next}" ]; then cron_next_day_of_month=$(( cron_next_day_of_month + 1 )) fi + cron_next_hour="${cron_next}" - #cron_next_minute=0 fi + print_debug "[timer] [cron] Parse Day of Week" cron_next=$(parse_expression "${cron_day_of_week}" 6 "${cron_next_day_of_week}") if [ "${cron_next}" != "${cron_next_day_of_week}" ]; then - day_of_week_difference=$(( ${cron_next} - ${cron_next_day_of_week} )) + day_of_week_difference=$(( cron_next - cron_next_day_of_week )) - if [ "${day_of_week_difference}" -lt "0" ]; then + if [ "${day_of_week_difference}" -lt 0 ]; then day_of_week_difference=$(( day_of_week_difference + 7 )) fi @@ -1920,6 +1928,7 @@ timer() { cron_next_minute=0 fi + print_debug "[timer] [cron] Parse day of month" case "${cron_next_month}" in 1|3|5|7|8|10|12) last_day_of_month="31" @@ -1959,6 +1968,7 @@ timer() { cron_next_day_of_month=$cron_next fi + print_debug "[timer] [cron] Parse Next Month" cron_next=$(parse_expression "${cron_month}" 12 "${cron_next_month}") if [ "${cron_next}" != "${cron_next_month}" ]; then if [ "${cron_next}" -gt "12" ]; then