From 81e150fbd84e0bff8a5d4b80f93a128cabeb4433 Mon Sep 17 00:00:00 2001 From: Squibid Date: Sat, 15 Jul 2023 04:41:40 -0400 Subject: new genblog script, remove old gen scripts new blog layout --- blog.html | 37 +++++++++++++++++++------------------ blog/newblog | 17 ++++++++++++++++- gen | 4 ---- genblog | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++ index.html | 24 ++++++++++++------------ scripts/genblog | 25 ------------------------- scripts/gengit | 13 ------------- 7 files changed, 98 insertions(+), 73 deletions(-) delete mode 100755 gen create mode 100755 genblog delete mode 100755 scripts/genblog delete mode 100755 scripts/gengit diff --git a/blog.html b/blog.html index 95c4af2..f9cd986 100644 --- a/blog.html +++ b/blog.html @@ -7,32 +7,33 @@ - -
+ +
-

Squibid's Blog

+

+ Squibid's Blog +

-

-

- rss feed +

+ + librex and dots2023/06/27
+ It's Alive!2023/05/01
+ state of the site2023/03/11
+ +

+

+ subscribe +

diff --git a/blog/newblog b/blog/newblog index da0def9..2cd5ca3 100755 --- a/blog/newblog +++ b/blog/newblog @@ -3,6 +3,21 @@ read -p "Enter name of blog: " name filename="$(echo $name | sed 's/ /-/g').html" -printf "$name\n\n\n

\n

\n" > $filename + +# make sure we don't overwrite an existent file +[ -f $filename ] && + printf "File already exists! Please choose a different filename.\n"; exit 1 + +printf ' + + '$name' + + +

+

+ + +' > $filename $EDITOR $filename + echo "Make sure to run sup to add to rss feed!" diff --git a/gen b/gen deleted file mode 100755 index d4894d7..0000000 --- a/gen +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -./scripts/gengit -./scripts/genblog diff --git a/genblog b/genblog new file mode 100755 index 0000000..12bb7fe --- /dev/null +++ b/genblog @@ -0,0 +1,51 @@ +#!/bin/sh +# +# genblog is a script to take data from my blogs and format it into html for +# my website +# +# by: Squibid +# + +# +# Helper variables and functions +# +bloglist=$(ls -t1 blog/*.html | grep -oP '(?<=\/).*?(?=\.)') +top5=$(printf "$bloglist\n" | head -5) + +blogdate() { + grep -oP '(?<=\)' "blog/$1.html" +} +blogtitle() { grep -oP '(?<=\).*(?=\<\/title\>)' "blog/$1.html"; } +htmlline() { + printf "\ $(blogtitle $1)\ +$(blogdate $1)
\n" +} + +# set file dates properly +for i in $bloglist; do + if $(touch -cd "$(blogdate $i)T00:00:00" /tmp/file); then + touch -amt "$(blogdate $i | sed 's/\///g')0000" "blog/$i.html" + fi +done + +# +# Start modifing our files +# + +# delete old bloglist +sed -i -n '1,/.*/p;/.*/,$p' index.html +sed -i -n '1,/.*/p;/.*/,$p' blog.html + +# top 5 blogs +for i in $top5; do + line=$(htmlline $i) + # add new bloglist + sed -i "/.*/i $line" index.html +done + +# generate the full blog list +for i in $bloglist; do + line=$(htmlline $i) + # add new bloglist + sed -i "/.*/i $line" blog.html +done diff --git a/index.html b/index.html index 58cf2be..b4a1ab7 100644 --- a/index.html +++ b/index.html @@ -32,19 +32,19 @@
diff --git a/scripts/genblog b/scripts/genblog deleted file mode 100755 index e77f85f..0000000 --- a/scripts/genblog +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/sh - -blogs=$(ls -ct1 blog/*.html) -blogs5=$(ls -ct1 blog/*.html | head -5) -date() { - ls -ct1l --time-style=+'%Y %b %d' $1 | cut -d ' ' -f 6-8 -} -# delete old bloglist -sed -i -n '1,/

/p;/ <\/p> /,$p' index.html -sed -i -n '1,/

/p;/ <\/p> /,$p' blog.html - -# top 5 blogs -for i in $blogs5; do - name=$(echo $i | sed 's/blog\///' | sed 's/\..*//' | sed 's/-/ /g') - line="$name [$(date $i)]
" - # add new bloglist - sed -i "/\ <\/p> /i $line" index.html -done -# full blog -for i in $blogs; do - name=$(echo $i | sed 's/blog\///' | sed 's/\..*//' | sed 's/-/ /g') - line="$name$(date $i)
" - # add new bloglist - sed -i "/ <\/p> /i $line" blog.html -done diff --git a/scripts/gengit b/scripts/gengit deleted file mode 100755 index 91a0b20..0000000 --- a/scripts/gengit +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh - -repos=$(ls -1 /var/git | grep -o '.*\.git' | head -5) - -# delete old list -sed -i -n '1,/

/p;/ <\/p> /,$p' index.html - -for i in $repos ; do - name=$(echo $i | sed 's/\.git//') - line="$name
" - # add new repo - sed -i "/ <\/p> /i $line" index.html -done -- cgit v1.2.1