diff options
| author | eudoxia <uplink@distress.network> | 2020-12-26 03:15:31 -0500 |
|---|---|---|
| committer | eudoxia <uplink@distress.network> | 2020-12-26 03:15:31 -0500 |
| commit | cf1074cd1d712cc63d5c07411757acd931a1f6a2 (patch) | |
| tree | 9d2594613d8c64692560590720701b6ca4fb37be | |
| parent | ab80134eb6f21f9d66e5604ba536eeba26387152 (diff) | |
md.sh: toc line position determined from md-header line count; other misc improvements
| -rwxr-xr-x | md-header | 12 | ||||
| -rwxr-xr-x | md.sh | 14 |
2 files changed, 13 insertions, 13 deletions
@@ -10,20 +10,20 @@ <link rel="icon" type="image/png" sizes="16x16" href="/favicon/favicon-16x16.png"> <link rel="manifest" href="/favicon/site.webmanifest"> <script src="/js/bg.js"></script> -<title>#</title> -<meta name="description" content="#" /> +<title></title> +<meta name="description" content="" /> +<meta http-equiv="last-modified" content="" /> </head> <body> <header> -<div class="bomber">#</div> +<div class="bomber"></div> <hr> <div class="identcontainer"> -<div class="ident"><time>#</time>––––<a href="https://distress.network">DistressNetwork°</a></div> +<div class="ident"><time datetime=""></time>––––<a href="https://distress.network">DistressNetwork°</a></div> <img class="headerlogo" src="/media/distressnetwork-b.svg" alt=""> </div> </header> <div class="contentlevel"> <main> -<div class="leading">#</div> +<div class="leading"></div> <hr> -<!-- end of header --> @@ -61,25 +61,25 @@ decode() { TITLE=$(grep -e '^title: ' -m 1 $IN | cut -f 2- -d ' ' | sedesc) -sed "s/<title>#/<title>${TITLE} \&mdash\; DistressNetwork°/1" -i'' $OUT +sed "s/<title>/&${TITLE} \&mdash\; DistressNetwork°/1" -i'' $OUT printf "[ok] \ttitle: %s\n" "$(echo "$TITLE" | unesc)" BOMBER=$(grep -e '^bomber: ' -m 1 $IN | cut -f 2- -d ' ' | sedesc) -sed "s/<div class=\"bomber\">#/<div class=\"bomber\">${BOMBER}/1" -i'' $OUT +sed "s/<div class=\"bomber\">/&${BOMBER}/1" -i'' $OUT printf "[ok] \tbomber: %s\n" "$(echo "$BOMBER" | unesc)" MDATE=$(stat -c '%y' $IN | sed -e 's/\.[0-9]* //' -e 's/\(..\)\(..\)$/\1:\2/') # format: "yyyy-mm-dd hh:mm:ss±zz:zz" (ISO 8601) DATE=$(echo $MDATE | cut -f 1 -d ' ' | sed -e 's/-//g' -e 's/^..//') # format: "yymmdd" (for humans) -sed "s;<div class=\"ident\"><time>#;<div class=\"ident\"><time datetime=\"${MDATE}\">${DATE};1" -i'' $OUT -sed "/^<\/head>/i <meta http-equiv=\"last-modified\" content=\"${MDATE}\" />" -i'' $OUT +sed -e "s;<div class=\"ident\"><time datetime=\";&${MDATE};1" -e "s;</time>;${DATE}&;1" -i'' $OUT +sed "s;<meta http-equiv=\"last-modified\" content=\";&${MDATE};1" -i'' $OUT printf "[ok] \tdate: %s (%s)\n" "$DATE" "$MDATE" LEADING=$(grep -e '^leading: ' -m 1 $IN | cut -f 2- -d ' ' | sedesc) -sed "s;<div class=\"leading\">#;<div class=\"leading\">${LEADING};1" -i'' $OUT +sed "s;<div class=\"leading\">;&${LEADING};1" -i'' $OUT printf "[ok] \tleading: %s\n" "$(echo "$LEADING" | unesc)" METADESC="\«\;${BOMBER}\»\; \&mdash\; ${LEADING}" -sed "s;<meta name=\"description\" content=\"#;<meta name=\"description\" content=\"${METADESC};1" -i'' $OUT +sed "s;<meta name=\"description\" content=\";&${METADESC};1" -i'' $OUT printf "[ok] \tmeta description\n" if [ -f $(echo $IN | cut -f 1 -d /)/nav.html ] ; then @@ -148,7 +148,7 @@ echo '</nav>' >> $tmp # get toc line number in output, insert data from tempfile -TOCLINE=$(grep -n '<!-- end of header -->' $OUT | cut -f 1 -d :) +TOCLINE=$(wc -l md-header | cut -f 1 -d ' ') sed "${TOCLINE}r $tmp" -i'' $OUT rm $tmp # cleanup |