syncthing: add yncthing-resolve-conflicts script

This commit is contained in:
sid 2026-03-01 18:17:35 +01:00
parent a37e4720ca
commit 17789ce55d
3 changed files with 53 additions and 1 deletions

View file

@ -0,0 +1,28 @@
DRY_RUN=true
if [[ "${1:-}" == "--apply" ]]; then
DRY_RUN=false
echo "--- RUNNING IN LIVE MODE: Files will be renamed ---"
else
echo "--- RUNNING IN DRY-RUN MODE: No changes will be made ---"
echo "--- Use 'syncthing-resolve-conflicts --apply' to perform the rename ---"
fi
find . -type f -name "*sync-conflict*" ! -name "*.db" -print0 | while IFS= read -r -d '' file; do
new=$(echo "$file" | sed -E 's/\.sync-conflict-[0-9]{8}-[0-9]{6}-[A-Z0-9]+//')
if [[ "$file" != "$new" ]]; then
if [ "$DRY_RUN" = true ]; then
echo "[DRY-RUN] Would rename: '$file' -> '$new'"
else
if [[ -f "$new" ]]; then
echo "[SKIP] Target already exists: '$new'"
else
echo "Renaming: '$file' -> '$new'"
mv "$file" "$new"
fi
fi
fi
done
echo "--- Done ---"