From 723bdb5a5ddb63c7294499649df6404afbd4612a Mon Sep 17 00:00:00 2001 From: Rohan Kumar Date: Tue, 30 Jan 2024 18:50:37 -0500 Subject: [PATCH] Add cdata to style tag --- scripts/xhtmlize-single-file.sh | 2 +- scripts/xhtmlize.sh | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/scripts/xhtmlize-single-file.sh b/scripts/xhtmlize-single-file.sh index bfab927..1405dba 100644 --- a/scripts/xhtmlize-single-file.sh +++ b/scripts/xhtmlize-single-file.sh @@ -40,7 +40,7 @@ run_xmllint() { sed 7d "$html_file" | run_xmllint | tail -n +2 >"$tmp_file" { head -n7 "$tmp_file" | sed -e 's/^\t//' - cat "${OUTPUT_DIR:?}/tmp.css" + cat "${OUTPUT_DIR:?}/tmp.xhtml" # shellcheck disable=SC2016 # these are regex statements, not shell expressions #shellcheck source=/home/rkumar/Executables/ghq/git.sr.ht/~seirdy/seirdy.one/scripts/xhtmlize.sh sed \ diff --git a/scripts/xhtmlize.sh b/scripts/xhtmlize.sh index 32ad48a..5a40078 100644 --- a/scripts/xhtmlize.sh +++ b/scripts/xhtmlize.sh @@ -14,13 +14,14 @@ temp_resume="$(mktemp)" # I have an alias for a redirect. I also define the redirect in Nginx, but this is there for the envs.net/~seirdy mirror. Hugo aliases don't have trailing slashes; this will trip up xmllint. sed -i -e 's|#<\1" />#' "$output_dir/resume/index.html" mv "$output_dir/resume/index.html" "$temp_resume" - +# {{ $css.Content | safeCSS }}/*]]>*/--> { - sed -e '7q;d' "$output_dir/index.html" -} >"$output_dir/tmp.css" + sed -e '7q;d' "$output_dir/index.html" \ + | sed -e 's||/\*\]\]>\*/-->|' +} >"$output_dir/tmp.xhtml" cleanup() { - rm -f "$output_dir/tmp.css" - mv "$temp_resume" "$output_dir/resume/index.html" + rm "$output_dir/tmp.xhtml" + mv "$temp_resume" "$output_dir/resume/index.html" } trap cleanup EXIT