diff --git a/blog/.rss.item.template b/blog/.rss.item.template index 5d53253..f923827 100644 --- a/blog/.rss.item.template +++ b/blog/.rss.item.template @@ -1,13 +1,9 @@ TITLE - -https://www.clementchiew.me/blog/blog-CURRENTINT - +https://www.clementchiew.me/blog/blog-CURRENTINT $item PUBDATE - -GUID - +GUID diff --git a/blog/.rss.template b/blog/.rss.template index e84964b..aa27781 100644 --- a/blog/.rss.template +++ b/blog/.rss.template @@ -1,12 +1,12 @@ My Little Spot - https://www.clementchiew.me. + https://www.clementchiew.me en-us PUBDATE PUBDATE - https://www.clement.chiew/blog/rss + https://www.rssboard.org/rss-specification Some random bash scripts clementchiew95@disroot.org (Clement Chiew) clementchiew95@disroot.org (Clement Chiew) diff --git a/scripts/build-website.sh b/scripts/build-website.sh index fe960d7..e86509e 100755 --- a/scripts/build-website.sh +++ b/scripts/build-website.sh @@ -53,22 +53,22 @@ cat \ <( for ((i=1;i<10;i++)) do - itemnum=$(( CONTENTNUM - i )) - padint=$(printf %03d $itemnum) - title=$(jq -r '.data | .['"$padint"'].title' .data.json ) - pubdate=$(jq -r '.data | .['"$padint"'].published_date' .data.json ) - guid=$(jq -r '.data | .['"$padint"'].guid' .data.json ) + export padint=$( printf %03d $(( CONTENTNUM -i )) ) cat \ - <(head -n $(( itemlinereplace -1 )) .rss.item.template | - sed "s/TITLE/$title/; - s/CURRENTINT/$padint/" + <( + head -n $(( itemlinereplace -1 )) .rss.item.template | + title=$(jq -r '.data | .['"$padint"'].title' .data.json ) \ + perl -pe 's/TITLE/$ENV{title}/; s/CURRENTINT/$ENV{padint}/' ) \ - <(cat content-$padint quote-$padint | + <( + cat content-$padint quote-$padint | tidy -q -asxml | xq -cx '.html.body' ) \ - <(tail -n +$(( itemlinereplace +1 )) .rss.item.template | - sed "s/PUBDATE/$pubdate/; - s/GUID/$guid/" + <( + tail -n +$(( itemlinereplace +1 )) .rss.item.template | + pubdate=$(jq -r '.data | .['"$padint"'].published_date' .data.json ) \ + guid=$(jq -r '.data | .['"$padint"'].guid' .data.json ) \ + perl -pe 's/PUBDATE/$ENV{pubdate}/; s/GUID/$ENV{guid}/' ) done ) \