Merge branch 'main' into stable

templates/application/scan_external_mounts.sh

@@ -7,19 +7,27 @@ if [[ $(pgrep -f "${0}" | wc -l) -eq 2 ]]; then
 	# We sleep a deterministic amount of time, which will be between 0 an 128 m and allways the same within
 	# a specific host, but will differ between hosts
 	sleep $((16#$(ip a | grep "link/ether" | head -1 | awk -F ':' '{print $6}' | awk '{print $1}') / 2))m
+	errors=''
 	for container in $(get_containers); do
+		error_ids="${error_ids} ${container}: "
 		for id in $(nocc "${container}" files_external:list --all --output json | jq '.[].mount_id' | jq .); do
 			nocc "${container}" files_external:scan "${id}" | grep Error
-      # shellcheck disable=SC2181
+			# shellcheck disable=SC2181
-      if [[ ${?} -eq 0 ]]; then
+			if [[ ${?} -eq 0 ]]; then
-        error_ids="${error_ids} ${container}: ${id}"
+				errors="${errors} ${id}"
-      fi
+				error_ids="${error_ids} ${id}"
+			fi
 		done
 	done
+else
+	echo "Another instance of this script is already running, exiting"
+	pgrep -a -f "${0}"
+	exit 0
 fi
 
-if [[ -n "${error_ids}" ]]; then
+if [[ -n "${errors}" ]]; then
-  echo "Errors found in the following mounts: ${error_ids}"
+	echo "Errors found in the following mounts: ${error_ids}"
-  exit 1
+	exit 1
 fi
+echo "No errors found"
 exit 0