From 7fc06236e40a5d60737f700114b8a6f0bb70f2b7 Mon Sep 17 00:00:00 2001
From: Timo Makinen <tmakinen@foo.sh>
Date: Fri, 13 Nov 2020 05:35:41 +0000
Subject: [PATCH] mirror: Shellcheck fixes for sync-mirrors

---
 roles/mirror/base/files/sync-mirrors | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/roles/mirror/base/files/sync-mirrors b/roles/mirror/base/files/sync-mirrors
index d8782d3..7d50b8b 100755
--- a/roles/mirror/base/files/sync-mirrors
+++ b/roles/mirror/base/files/sync-mirrors
@@ -15,7 +15,7 @@ logmsg() {
 }
 
 if [ -d ${CONFDIR} ]; then
-    MIRRORLIST="$(find ${CONFDIR}/ -name \*.conf | while read f ; \
+    MIRRORLIST="$(find ${CONFDIR}/ -name \*.conf | while read -r f ; \
         do basename "${f}" | sed -e 's/\.conf$//' ; done)"
     if [ "${MIRRORLIST}" = "" ]; then
         echo "ERR: No configured mirrors found" 1>&2
@@ -80,18 +80,12 @@ fi
 umask 022
 
 if [ -f "${LOCKFILE}" ]; then
-    kill -0 "$(cat ${LOCKFILE})"
-    if [ $? -ne 1 ]; then
-	which stat > /dev/null 2>&1
-	if [ $? -eq 0 ]; then
-	    STARTED=" ($(stat --format='%y' ${LOCKFILE}))"
-	else
-	    STARTED=""
-	fi
+    if kill -0 "$(cat ${LOCKFILE})" ; then
+	STARTED=" ($(stat --format='%y' ${LOCKFILE}))"
         echo "ERR: Lockfile exists${STARTED}, exiting" 1>&2
         exit 1
     else
-        echo "WARN: Removing stale lock file..." 1>&2
+	echo "WARN: Removing stale lock file..." 1>&2
         rm -f "${LOCKFILE}"
     fi
 fi