Refactor rsync-backup

bin/rsync-backup

@@ -1,29 +1,21 @@
 #!/usr/bin/env bash
 
 # A script to perform incremental backups with rsync
-# Source: https://linuxconfig.org/how-to-create-incremental-backups-using-rsync-on-linux
 
-set -o errexit
-set -o nounset
-set -o pipefail
-
-readonly BACKUP_DIR="/mnt/backup"
-readonly DATETIME
 DATETIME="$(date '+%Y-%m-%d_%H:%M:%S')"
+readonly BACKUP_DIR="/mnt/backup"
 readonly BACKUP_PATH="${BACKUP_DIR}/${DATETIME}"
 readonly LATEST_LINK="${BACKUP_DIR}/latest"
-readonly TEMP_DIR
+
 TEMP_DIR=$(mktemp -d || echo "Failed to make temp dir"; exit 1)
 chmod 700 "${TEMP_DIR}"
-trap 'rm -rf "${TEMP_DIR}"; exit 0' 0 1 2 3 15
+trap 'rm -rf "${TEMP_DIR}"; exit 0' EXIT SIGHUP SIGINT SIGQUIT SIGTERM
-
-mkdir -p "${BACKUP_DIR}"
 
 while read -r line; do
     rsync -aAX "$line" "${TEMP_DIR}";
 done </etc/rsync-includes.txt
 
-rsync -av --delete "${TEMP_DIR}/" --link-dest "${LATEST_LINK}" --exclude=".cache" "${BACKUP_PATH}"
+rsync -av --delete "${TEMP_DIR}/" --link-dest="${LATEST_LINK}" "${BACKUP_PATH}"
 
-rm -rf "${LATEST_LINK}"
+rm -f "${LATEST_LINK}"
-ln -s "${BACKUP_PATH}" "${LATEST_LINK}"
+ln -sf "${BACKUP_PATH}" "${LATEST_LINK}"

systemd/system/rsync-backup.service

@@ -1,8 +1,8 @@
 [Unit]
 Description=rsync-backup
 AssertFileIsExecutable=/usr/local/bin/rsync-backup
-Requires=hyperreal.coffee-share.mount
+Requires=mnt-backup.mount
-After=hyperreal.coffee-share.mount
+After=mnt-backup.mount
 
 [Service]
 Type=oneshot

systemd/system/rsync-backup.timer

@@ -2,7 +2,7 @@
 Description=rsync-backup
 
 [Timer]
-OnCalendar=weekly
+OnCalendar=Sun *-*-* 23:30:00
 Persistent=true
 
 [Install]