diff --git a/_config.sh b/_config.sh index c8d8b86..3110cf1 100644 --- a/_config.sh +++ b/_config.sh @@ -15,8 +15,8 @@ HTML_LANG="en_US" # Your document (HTML) language setting TOC=true SYNTAX=true POSTS_DIR="posts/" -POSTS=$(find $POSTS_DIR -type f -name *.md) +POSTS=$(find $POSTS_DIR -type f) WEB_HTML="blog/" OUTPUT="_output/" -TIME=$(date +"%T %Z") +TIME=$(date -u +"%T %z") TTL="60" diff --git a/makefile b/makefile index ad7ade7..6d67bae 100644 --- a/makefile +++ b/makefile @@ -2,8 +2,11 @@ .PHONY: build build: + rm -rf _output + mkdir -p _output/blog bash pblog.sh > _output/blog/feed.xml xsltproc _output/blog/feed.xml > _output/blog/index.html + bash sed.sh serve: build python3 -m http.server --directory _output/ diff --git a/pblog.sh b/pblog.sh index 64544de..0035b7e 100644 --- a/pblog.sh +++ b/pblog.sh @@ -1,7 +1,6 @@ #!/bin/sh source _config.sh - ################################################################################### # !WARNING! # You probably don't need to tweak anything below this line. Edit at your own risk! @@ -31,8 +30,6 @@ rsync $POSTS_DIR*.html $OUTPUT$WEB_HTML; rm $POSTS_DIR*.html -# Remove the default blog index to avoid pulling into the XML feed -rm $OUTPUT$WEB_HTML/index.html echo " @@ -55,8 +52,8 @@ then CAT_DATE=$(gdate -d "$(sed -n 's|^

\([^<]*\)

$|\1|p' $file)" +"%Y/%m/%d/%u") POST_DATE=$(gdate -d "$(sed -n 's|^

\([^<]*\)

$|\1|p' $file)" +"%a, %d %b %Y") else - CAT_DATE=$(date -d "$(sed -n 's|^

\([^<]*\)

$|\1|p' $file)" +"%Y/%m/%d/%u") - POST_DATE=$(date -d "$(sed -n 's|^

\([^<]*\)

$|\1|p' $file)" +"%a, %d %b %Y") + CAT_DATE=$(date -u -d "$(sed -n 's|^

\([^<]*\)

$|\1|p' $file)" +"%Y/%m/%d/%u") + POST_DATE=$(date -u -d "$(sed -n 's|^

\([^<]*\)

$|\1|p' $file)" +"%a, %d %b %Y") fi echo " diff --git a/sed.sh b/sed.sh new file mode 100755 index 0000000..6b1fa8f --- /dev/null +++ b/sed.sh @@ -0,0 +1,4 @@ +#!/usr/bin/env bash +sed -i -e 's/
//' -e 's/<\/header>//' -e 's//\n<\!--#include file=\"\/nav\"-->\n/' -e 's/<\/body>/<\/body>\n\n/' -e 's/..\/..\/style.css/\/blog\/style.css/' _output/blog/index.html +sed -i -n '1,/