diff --git a/bin/controller.rc b/bin/controller.rc index b415b79..3aeccdb 100755 --- a/bin/controller.rc +++ b/bin/controller.rc @@ -21,10 +21,10 @@ for(i in siteTitle siteSubTitle title extraHeaders) # Title fn gentitle { - echo '

' ^ $"siteTitle ^ '' ^ $"siteSubTitle ^ '

' + echo '

' ^ $"siteTitle ^ ' ' ^ $"siteSubTitle ^ '

' } -dirfilter = '/\/[._]/d; s,^\./,,; s,\.md$,,;' +dirfilter = '/\/[._]/d; s,^\./,,; s,\.md$,,; s,\.html,,;' # Sidebar fn menu { @@ -77,7 +77,11 @@ fn genbody { markdown.pl < $body.md if not if ( test -f $body.tpl ) template.awk $body.tpl | rc $rcargs - if not if ( ~ $body */blog/index */blog//index && ~ $#blogDirs 0 ) + if not if ( test -f $body.html ) + cat $body.html | /bin/sed '0,//d; /<\/body>/,$d' + if not if (~ $body *.html && test -f $body ) + sed '0,//d;/<\/body>/,$d' < $body + if not if ( ~ $body */[bB]log/index */[bB]log//index && ~ $#blogDirs 0 ) blogDirs = `{basename -d $body} if not if(~ $body */index && ~ $#blogDirs 0) { echo '

' `{basename `{basename -d $body}}'

' diff --git a/bin/gensitemaptxt.sh b/bin/gensitemaptxt.sh deleted file mode 100755 index f892765..0000000 --- a/bin/gensitemaptxt.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh -for d in sites/*/; do - find $d -name '*.md'|sed -e 's/\.md$//' -e 's,/index$,/,' -e 's,^sites/,http://,' > $d/sitemap.txt -done -