From 7e4c07313301fdc43bd60f328dba8bf638813a37 Mon Sep 17 00:00:00 2001 From: Hiltjo Posthuma Date: Fri, 1 Jan 2021 22:34:04 +0100 Subject: sfeed_update: if baseurl is empty then use the path from the feed by default Feeds should contain absolute urls, but if it does not have it then this makes it more convenient to configure such feeds. --- sfeed_update | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/sfeed_update b/sfeed_update index 398c408..0d39625 100755 --- a/sfeed_update +++ b/sfeed_update @@ -84,11 +84,17 @@ feed() { curjobs=$((curjobs + 1)) (name="$1" - filename="$(printf '%s' "$1" | tr '/' '_')" feedurl="$2" basesiteurl="$3" encoding="$4" + # if baseurl is empty then use the path from the feed by default. + if [ "${basesiteurl}" = "" ]; then + host="${feedurl##*://}" + basesiteurl="${feedurl%%://*}://${host%/*}/" + fi + + filename="$(printf '%s' "${name}" | tr '/' '_')" sfeedfile="${sfeedpath}/${filename}" tmpfeedfile="${sfeedtmpdir}/${filename}" -- cgit v1.2.3