From 026a30e243d0972907c64104e49c4332e4eaad58 Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Tue, 29 Apr 2025 10:19:48 -0300 Subject: src/{conf,indexbody}: Replace $feedicon_url_prefix with $feedicon_url --- src/categoriesbody | 5 +---- src/conf | 12 ++++++------ src/indexbody | 5 +---- 3 files changed, 8 insertions(+), 14 deletions(-) diff --git a/src/categoriesbody b/src/categoriesbody index c84c50b..2d2a9b5 100755 --- a/src/categoriesbody +++ b/src/categoriesbody @@ -18,10 +18,7 @@ for catsortdata in `cat "$DIR"/categories.txt`; do cat < $category - - - - + EOF mkwb indexbody "$FILENAME" "$catsortdata" diff --git a/src/conf b/src/conf index e94cc5d..16c43a8 100755 --- a/src/conf +++ b/src/conf @@ -62,7 +62,7 @@ unset root_dir img_dir unset updatedat unset css_url feed_url favicon_url -unset feedicon_url_prefix logo_url_prefix envelopeicon_url_prefix \ +unset feedicon_url logo_url_prefix envelopeicon_url_prefix \ lockicon_url_prefix unset publickey_url @@ -200,9 +200,9 @@ fi if [ -z "${feed_url:-}" ]; then feed_url="$BASE_URL/feed.xml" fi -if [ -z "${feedicon_url_prefix:-}" ]; then - needs "${img_dir:-}" 'Define either $feedicon_url_prefix or $img_dir' - feedicon_url_prefix="$BASE_URL/$img_dir/atom" +if [ -z "${feedicon_url:-}" ]; then + needs "${img_dir:-}" 'Define either $feedicon_url or $img_dir' + feedicon_url="$BASE_URL/$img_dir/atom.svg" fi if [ -z "${favicon_url:-}" ]; then needs "${img_dir:-}" 'Define either $favicon_url or $img_dir' @@ -227,7 +227,7 @@ discussions_url="$(printf '%s%s\n' "$discussions_url_prefix" "$title_uri" | shes css_url="$( printf '%s\n' "$css_url" | shesc)" feed_url="$( printf '%s\n' "$feed_url" | shesc)" -feedicon_url_prefix="$( printf '%s\n' "$feedicon_url_prefix" | shesc)" +feedicon_url="$( printf '%s\n' "$feedicon_url" | shesc)" favicon_url="$( printf '%s\n' "$favicon_url" | shesc)" logo_url_prefix="$( printf '%s\n' "$logo_url_prefix" | shesc)" envelopeicon_url_prefix="$(printf '%s\n' "$envelopeicon_url_prefix" | shesc)" @@ -242,7 +242,7 @@ titlefull_html="$(printf '%s\n' "$TITLEFULL_RAW" | htmlesc | shesc)" cat <<-EOF export css_url="$css_url" export feed_url="$feed_url" - export feedicon_url_prefix="$feedicon_url_prefix" + export feedicon_url="$feedicon_url" export favicon_url="$favicon_url" export logo_url_prefix="$logo_url_prefix" export envelopeicon_url_prefix="$envelopeicon_url_prefix" diff --git a/src/indexbody b/src/indexbody index 7e076fe..eaef320 100755 --- a/src/indexbody +++ b/src/indexbody @@ -15,10 +15,7 @@ eval "$(assert-arg -- "$FILENAME" 'FILENAME.conf')" cat < Atom feed - - - + and feeds by categories.

-- cgit v1.2.3