From 00a612503626b467fb9dbc86414150919480054d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dennis=20K=C3=B6rner?=
 <79668910+netzwergehh@users.noreply.github.com>
Date: Thu, 3 Jun 2021 11:53:55 +0200
Subject: [PATCH] Update mirrorsync.sh

Changed variable names to lowerspace
Added doublequotes to variable usage
Converted opts to an array
Doublebrackets instead of [ ]
Changed to printf instead of echo for logging
Added force to rm
---
 mirrorsync.sh | 45 +++++++++++++++++++++++----------------------
 1 file changed, 23 insertions(+), 22 deletions(-)

diff --git a/mirrorsync.sh b/mirrorsync.sh
index 11257b2..51da284 100644
--- a/mirrorsync.sh
+++ b/mirrorsync.sh
@@ -32,9 +32,9 @@
 #
 
 
-RSYNC="/usr/bin/rsync"
+rsync="/usr/bin/rsync"
 # You can change v to q if you do not want detailed logging
-OPTS="-vrlptDSH --exclude=*.~tmp~ --delete-delay --delay-updates"
+opts=(-vrlptDSH --exclude=*.~tmp~ --delete-delay --delay-updates)
 
 # Please use a mirror next to you for initial sync
 # or if you are hosting a private rather than a pulic mirror.
@@ -42,34 +42,35 @@ OPTS="-vrlptDSH --exclude=*.~tmp~ --delete-delay --delay-updates"
 # Also we might restrict access to the master in the future.
 # A complete list of mirrors can be found at
 # https://mirrors.rockylinux.org/mirrormanager/mirrors/Rocky
-SRC="msync.rockylinux.org::rocky/mirror/pub/rocky/"
+src="msync.rockylinux.org::rocky/mirror/pub/rocky"
 
 # Your local path. Change to whatever fits your system.
-# MIRRORMODULE is also used in syslog output.
-MIRRORMODULE="rocky-linux"
-DST="/mnt/mirrorserver/${MIRRORMODULE}"
+# $mirrormodule is also used in syslog output.
+mirrormodule="rocky-linux"
+dst="/mnt/mirrorserver/${mirrormodule}"
 
-FILELISTFILE="fullfiletimelist-rocky"
-LOCKFILE=$0.lockfile
+filelistfile="fullfiletimelist-rocky"
+lockfile="$0.lockfile"
+logfile="$0.log"
 
-CHECKRESULT=$(${RSYNC} --no-motd --dry-run --out-format='%n' ${SRC}${FILELISTFILE} ${DST}/${FILELISTFILE})
-if [ -z $CHECKRESULT ]; then
-	echo "${FILELISTFILE} unchanged. Not updating at" $(date) >> $0.log 2>&1
-	logger -t rsync "Not updating ${MIRRORMODULE}: ${FILELISTFILE} unchanged."
+checkresult=$(${rsync} --no-motd --dry-run --out-format="%n" "${src}/${filelistfile}" "${dst}/${filelistfile}")
+if [[ -z "$checkresult" ]]; then
+	printf "%s unchanged. Not updating at %(%c)T\n" "$filelistfile" -1 >> "$logfile" 2>&1
+	logger -t rsync "Not updating ${mirrormodule}: ${filelistfile} unchanged."
 	exit 1
 fi
 
 
-if [ -e $LOCKFILE ]; then
-	echo "Update already in progress at" $(date) >> $0.log 2>&1
-	logger -t rsync "Not updating ${MIRRORMODULE}: already in progress."
+if [[ -e "$lockfile" ]]; then
+	printf "Update already in progress at %(%c)T\n" -1 >> "$logfile" 2>&1
+	logger -t rsync "Not updating ${mirrormodule}: already in progress."
 else
-	touch $LOCKFILE
-	echo "Started update at" $(date) >> $0.log 2>&1
-	logger -t rsync "Updating ${MIRRORMODULE}"
+	touch $lockfile
+	printf "Started update at %(%c)T\n" -1 >> "$logfile" 2>&1
+	logger -t rsync "Updating ${mirrormodule}"
 		
-	${RSYNC} ${OPTS} ${SRC} ${DST}/ >> $0.log 2>&1
-	logger -t rsync "Finished updating ${MIRRORMODULE}"  
-	echo "End:" $(date) >> $0.log 2>&1
-	rm $LOCKFILE
+	${rsync} "${opts[@]}" "${src}/" "${dst}/" >> "$logfile" 2>&1
+	logger -t rsync "Finished updating ${mirrormodule}"  
+	printf "End: %(%c)T\n" -1 >> "$logfile" 2>&1
+	rm -f $lockfile
 fi