From 875d1b0305f0dc404909907574242ac1740f6426 Mon Sep 17 00:00:00 2001
From: Hiltjo Posthuma <hiltjo@codemadness.org>
Date: Sun, 18 Feb 2018 15:46:49 +0100
Subject: sfeed_update: revert more merge logic
this makes sure the sort order of the initial feed sync works again.
---
sfeed_update | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/sfeed_update b/sfeed_update
index 5e265a7..6c4ed8d 100755
--- a/sfeed_update
+++ b/sfeed_update
@@ -89,11 +89,10 @@ feed() {
if [ -e "${sfeedfile}" ]; then
merge "${sfeedfile}" "${tmpfeedfile}" > "${sfeedfilenew}"
- # append new entries to feed file.
- cat "${sfeedfilenew}" >> "${sfeedfile}"
- rm -f "${sfeedfilenew}"
+ # overwrite old file with updated file
+ mv "${sfeedfilenew}" "${sfeedfile}"
else
- mv "${tmpfeedfile}" "${sfeedfile}"
+ merge "/dev/null" "${tmpfeedfile}" > "${sfeedfile}"
fi
fi) &
}
--
cgit v1.2.3