From f9531d4a50dbd5e85f39bda1a5aa25538fd1536d Mon Sep 17 00:00:00 2001
From: jmqm <jmqm@outlook.com>
Date: Wed, 26 May 2021 06:32:01 -0500
Subject: [PATCH] Minor echo changes and additions (#9)

- Remove unnecessary `echo`es.
- Remove `LOGFILE` environment variable.
- Minor documentation and `echo` changes and additions.
---
 Dockerfile    |  1 -
 README.md     |  1 -
 backup.sh     |  3 +--
 entrypoint.sh | 20 +++++++++-----------
 4 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index c184398..2f9bdd0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -13,7 +13,6 @@ ENV CRON_TIME "0 */12 * * *"
 ENV UID 100
 ENV GID 100
 ENV CRONFILE /etc/crontabs/root
-ENV LOGFILE /app/log/backup.log
 ENV DELETE_AFTER 0
 
 COPY entrypoint.sh /usr/local/bin/entrypoint.sh
diff --git a/README.md b/README.md
index 7a982ef..b7d1199 100644
--- a/README.md
+++ b/README.md
@@ -55,7 +55,6 @@ services:
 | Environment Variable | Info                                                                                         |
 | -------------------- | -------------------------------------------------------------------------------------------- |
 | TZ ¹                 | Timezone inside the container. Can mount `/etc/localtime` instead as well _(recommended)_.   |
-| LOGFILE              | Log file path relative to inside the container.                                              |
 | CRONFILE             | Cron file path relative to inside the container.                                             |
 
 ¹ See <https://en.wikipedia.org/wiki/List_of_tz_database_time_zones> for more information
diff --git a/backup.sh b/backup.sh
index 42ec73b..db65d29 100644
--- a/backup.sh
+++ b/backup.sh
@@ -12,6 +12,5 @@ BACKUP_ATTACHMENTS=attachments # directory
 BACKUP_SENDS=sends # directory
 
 # Create an archive of the files and directories.
-echo "[INFO] Starting backup at $(date +"%F %r")..."
 cd /data && tar -Jcf $BACKUP_LOCATION $BACKUP_DB $BACKUP_RSA $BACKUP_CONFIG $BACKUP_ATTACHMENTS $BACKUP_SENDS 2>/dev/null && cd /
-echo "[INFO] Backup completed at $(date +"%F %r")."
+echo "[INFO] Created a new backup on $(date +"%F %r")."
diff --git a/entrypoint.sh b/entrypoint.sh
index 71d3643..ab62744 100755
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -1,33 +1,31 @@
 #!/bin/sh
 
 BACKUP_CMD="/sbin/su-exec ${UID}:${GID} /app/backup.sh"
-
-echo "Running $(basename "$0") as $(id)"
+LOGS_FILE="/app/log/backup.log"
 
 # Run backup script once ($1 = First argument passed).
 if [ "$1" = "manual" ]; then
+  echo "[INFO] Running one-time, started at $(date +"%F %r")."
   $BACKUP_CMD
   exit 0
 fi
 
-# Initialize cron
+# Create cron jobs.
 if [ "$(id -u)" -eq 0 ] && [ "$(grep -c "$BACKUP_CMD" "$CRONFILE")" -eq 0 ]; then
-  echo "Initalizing..."
-  echo "Writing backup command \"$BACKUP_CMD\" to cron."
-  echo "$CRON_TIME $BACKUP_CMD >> $LOGFILE 2>&1" | crontab -
+  echo "$CRON_TIME $BACKUP_CMD >> $LOGS_FILE 2>&1" | crontab -
+  # Delete after x days job here.
 fi
 
-# Start crond if it's not running
+# Start crond if it's not running.
 pgrep crond > /dev/null 2>&1
 if [ $? -ne 0 ]; then
   /usr/sbin/crond -L /app/log/cron.log
 fi
 
-# Restart script as user "app:app"
+# Restart script as user "app:app".
 if [ "$(id -u)" -eq 0 ]; then
-  echo "Restarting $(basename "$0") as app:app"
   exec su-exec app:app "$0" "$@"
 fi
 
-echo "[INFO] Container started at $(date +"%F %r")" > "$LOGFILE"
-tail -F "$LOGFILE" /app/log/cron.log
+echo "[INFO] Running automatically (${CRON_TIME}), started at $(date +"%F %r")." > "$LOGS_FILE"
+tail -F "$LOGS_FILE" # Keeps terminal open and writes logs.