From 43bc6b8b32577e598b6876c64c17306be41ea820 Mon Sep 17 00:00:00 2001
From: Roelf Wichertjes <contact@roelf.org>
Date: Thu, 24 Mar 2022 17:03:47 +0100
Subject: [PATCH] Tweaked things further.

---
 upload-single.sh |  3 ++-
 uploader.sh      | 13 ++++++++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/upload-single.sh b/upload-single.sh
index a66c12c..0974932 100755
--- a/upload-single.sh
+++ b/upload-single.sh
@@ -11,7 +11,7 @@ set -x
 cd "$1"
 upload="$(basename "$(pwd)")"
 export CUR_SIZE=$( du -B1 -s . | grep -oE "^[0-9]+" )
-export YEAR=`date +%Y`
+export YEAR=$(date +%Y)
 echo ia upload "archiveteam_archivebot_go_${upload}" * \
 	--sleep=120 \
 	--retries=100 \
@@ -24,6 +24,7 @@ echo ia upload "archiveteam_archivebot_go_${upload}" * \
 	--metadata="creator:Archive Team" \
 	--metadata="date:${YEAR}" \
 	--checksum \
+	--verify \
 	--delete
 
 # TEST SLEEP
diff --git a/uploader.sh b/uploader.sh
index 1788517..30879ec 100755
--- a/uploader.sh
+++ b/uploader.sh
@@ -11,7 +11,18 @@ do
 	echo "Starting new loop..."
 	for pack in */; do
 		echo "Trying claim ${pack}..."
-		flock --verbose -x --nonblock "$pack" /upload-single.sh "$pack" || echo "Could not claim pack!"
+		set +e
+		flock --verbose -x --conflict-exit-code 234 --nonblock "$pack" /upload-single.sh "$pack"
+		lock_rc="${?}"
+		set -e
+		if [ "$lock_rc" -ne 0 ]; then
+			if [ "$lock_rc" -ne 234 ]; then
+				echo "Could not claim pack!"
+			else
+				echo "Error return: ${lock_rc}."
+				exit "${lock_rc}"
+			fi
+		fi
 	done
 	sleep 30
 done