From 6d02279c3526d00ca63164f89e6bdbbee9828520 Mon Sep 17 00:00:00 2001 From: Paul Buetow Date: Sat, 28 May 2022 18:40:46 +0100 Subject: automatically use top level HTML stylesheet --- header.html.part | 2 +- lib/generate.source.sh | 11 +++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/header.html.part b/header.html.part index 0d7f506..f2592b3 100644 --- a/header.html.part +++ b/header.html.part @@ -4,6 +4,6 @@ %%TITLE%% - + diff --git a/lib/generate.source.sh b/lib/generate.source.sh index d988fde..dedbe31 100644 --- a/lib/generate.source.sh +++ b/lib/generate.source.sh @@ -98,7 +98,13 @@ generate::_fromgmi () { if [[ -z "$title" ]]; then title=$SUBTITLE fi - $SED -i "s|%%TITLE%%|$title|g; s|%%DOMAIN%%|$DOMAIN|g" "$dest.tmp" + + local stylesheet="$(basename "$HTML_CSS_STYLE")" + if [[ "$dest" =~ gemfeed ]]; then + stylesheet="../$stylesheet" + fi + $SED -i "s|%%TITLE%%|$title|g;s|%%DOMAIN%%|$DOMAIN|g;s|%%STYLESHEET%%|$stylesheet|g;" \ + "$dest.tmp" mv "$dest.tmp" "$dest" git::add "$format" "$dest" @@ -121,10 +127,7 @@ generate::fromgmi () { log INFO "Converted $num_gmi_files Gemtext files" - # Add CSS style sheet (for html only). For simplicity, copy style sheet - # file to ./ and to ./gemfeed directories (not to mess with file paths too much). cp $HTML_CSS_STYLE $CONTENT_BASE_DIR/gemtext/style.css - cp $HTML_CSS_STYLE $CONTENT_BASE_DIR/gemtext/gemfeed/style.css # Add non-.gmi files to html dir. log VERBOSE "Adding other docs to $*" -- cgit v1.2.3