commit 39cda256dae815015400fc32d0f288dd55977fb5
parent 0c6ca5aa4191aef9a19cc38db4eabf9009f36d08
Author: Hiltjo Posthuma <hiltjo@codemadness.org>
Date:   Sun, 18 Feb 2018 14:47:11 +0100
sfeed_update: dont allow TAB in filename (messes up the merge logic)
Diffstat:
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/sfeed_update b/sfeed_update
@@ -31,11 +31,13 @@ loadconfig() {
 # merge raw files.
 # merge(oldfile, newfile)
 merge() {
+	oldfile="$(printf '%s' "$1" | tr '	' ' ')"
+	newfile="$(printf '%s' "$2" | tr '	' ' ')"
 	# unique check by id, title, link.
 	# print only new entries in newfile.
 	# order new items by timestamp (asc).
-	(sed 's@^@O	@' "$1"
-	sed 's@^@N	@' "$2") | \
+	(sed 's@^@O	@' "${oldfile}"
+	sed 's@^@N	@' "${newfile}") | \
 		LC_ALL=C awk '!x[$7 "	" $3 "	" $4]++ && $1 == "N"' 2>/dev/null | \
 		cut -f 2- | \
 		sort -t '	' -k1n,1