itRework makefile and auto-generate index.txt - monochromatic - monochromatic blog: http://blog.z3bra.org	Err	z3bra.org	70
hgit clone git://z3bra.org/monochromatic	URL:git://z3bra.org/monochromatic	z3bra.org	70
1Log	/scm/monochromatic/log.gph	z3bra.org	70
1Files	/scm/monochromatic/files.gph	z3bra.org	70
1Refs	/scm/monochromatic/refs.gph	z3bra.org	70
i---	Err	z3bra.org	70
1commit 63e255e9c8d8b7fa7447dbb04eb72c6974d58a5e	/scm/monochromatic/commit/63e255e9c8d8b7fa7447dbb04eb72c6974d58a5e.gph	z3bra.org	70
1parent f19390275e984e18ad0f4acffa13d92b4870fc52	/scm/monochromatic/commit/f19390275e984e18ad0f4acffa13d92b4870fc52.gph	z3bra.org	70
hAuthor: Willy Goiffon <contact@z3bra.org>	URL:mailto:contact@z3bra.org	z3bra.org	70
iDate:   Mon, 23 Dec 2019 15:09:41 +0100	Err	z3bra.org	70
i	Err	z3bra.org	70
iRework makefile and auto-generate index.txt	Err	z3bra.org	70
i	Err	z3bra.org	70
iThis commit brings a lot of changes for the sake of simplicity.	Err	z3bra.org	70
iFiles are auto-generated were possible, rather than edited.	Err	z3bra.org	70
i	Err	z3bra.org	70
iOutput validity was moved out of the makefile too, as there is no	Err	z3bra.org	70
iadvantage in running it through the makefile	Err	z3bra.org	70
i	Err	z3bra.org	70
iDiffstat:	Err	z3bra.org	70
i  M .gitignore                          |       2 +-	Err	z3bra.org	70
i  M Makefile                            |      34 +++++++++++++------------------	Err	z3bra.org	70
i  M config.mk                           |       8 +++++---	Err	z3bra.org	70
i  A genindex.sh                         |       9 +++++++++	Err	z3bra.org	70
i  D index.txt                           |      29 -----------------------------	Err	z3bra.org	70
i  D post.sh                             |      43 ------------------------------	Err	z3bra.org	70
i  D publi.sh                            |      24 ------------------------	Err	z3bra.org	70
i  D tomarkdown.sed                      |      75 -------------------------------	Err	z3bra.org	70
i	Err	z3bra.org	70
i8 files changed, 29 insertions(+), 195 deletions(-)	Err	z3bra.org	70
i---	Err	z3bra.org	70
1diff --git a/.gitignore b/.gitignore	/scm/monochromatic/file/.gitignore.gph	z3bra.org	70
it@@ -1,5 +1,5 @@	Err	z3bra.org	70
i .gitignore	Err	z3bra.org	70
i-last.txt	Err	z3bra.org	70
i+index.txt	Err	z3bra.org	70
i *.html	Err	z3bra.org	70
i *.ico	Err	z3bra.org	70
i img/*	Err	z3bra.org	70
1diff --git a/Makefile b/Makefile	/scm/monochromatic/file/Makefile.gph	z3bra.org	70
it@@ -1,32 +1,26 @@	Err	z3bra.org	70
i include config.mk	Err	z3bra.org	70
i 	Err	z3bra.org	70
i-.PHONY: all check clean	Err	z3bra.org	70
i+.PHONY: all clean	Err	z3bra.org	70
i+.SUFFIXES: .txt .html	Err	z3bra.org	70
i 	Err	z3bra.org	70
i-all: $(PAGES) $(FEEDS) $(EXTRA)	Err	z3bra.org	70
i+all: $(FEEDS) $(EXTRA) $(PAGES)	Err	z3bra.org	70
i 	Err	z3bra.org	70
i $(NAME).tbz: $(PAGES) $(EXTRA) $(FEEDS)	Err	z3bra.org	70
i         tar -cvjf $@ $(PAGES) $(EXTRA) $(FEEDS)	Err	z3bra.org	70
i 	Err	z3bra.org	70
i+index.txt:	Err	z3bra.org	70
i+        sh ./genindex.sh > $@	Err	z3bra.org	70
i+	Err	z3bra.org	70
i+$(FEEDS): index.txt	Err	z3bra.org	70
i+        mkdir -p `dirname $@`	Err	z3bra.org	70
i+        sed -f ./feed.sed < $< > $@	Err	z3bra.org	70
i+        	Err	z3bra.org	70
i+.txt.html:	Err	z3bra.org	70
i+        $(MD) $< | cat $(HEADER) - $(FOOTER) > $@	Err	z3bra.org	70
i+	Err	z3bra.org	70
i install: $(NAME).tbz	Err	z3bra.org	70
i         mkdir -p $(PREFIX)	Err	z3bra.org	70
i         tar -xjf $(NAME).tbz -C $(PREFIX)	Err	z3bra.org	70
i 	Err	z3bra.org	70
i-check: $(PAGES)	Err	z3bra.org	70
i-        @./validate.sh every damn thing about this blog	Err	z3bra.org	70
i-	Err	z3bra.org	70
i clean:	Err	z3bra.org	70
i-        rm -f $(PAGES) $(FEEDS) $(NAME).tbz	Err	z3bra.org	70
i-	Err	z3bra.org	70
i-.SUFFIXES: .txt .html .xml	Err	z3bra.org	70
i-	Err	z3bra.org	70
i-HEADER = header.tmpl	Err	z3bra.org	70
i-FOOTER = footer.tmpl	Err	z3bra.org	70
i-	Err	z3bra.org	70
i-$(FEEDS): index.txt	Err	z3bra.org	70
i-        @echo "RSSGEN $@"	Err	z3bra.org	70
i-        @mkdir -p `dirname $(FEEDS)`	Err	z3bra.org	70
i-        @sed -f feed.sed < index.txt > $(FEEDS)	Err	z3bra.org	70
i-	Err	z3bra.org	70
i-.txt.html: $(HEADER) $(FOOTER)	Err	z3bra.org	70
i-        @echo "MARKDOWN `basename $@`"	Err	z3bra.org	70
i-        @$(MD) $< | cat $(HEADER) - $(FOOTER) > $@	Err	z3bra.org	70
i+        rm -f $(PAGES) $(FEEDS) $(NAME).tbz index.txt	Err	z3bra.org	70
1diff --git a/config.mk b/config.mk	/scm/monochromatic/file/config.mk.gph	z3bra.org	70
it@@ -2,9 +2,11 @@ MD      = markdown	Err	z3bra.org	70
i 	Err	z3bra.org	70
i NAME    = monochromatic	Err	z3bra.org	70
i PREFIX  = /var/www/htdocs/monochromatic	Err	z3bra.org	70
i+HEADER  = header.tmpl	Err	z3bra.org	70
i+FOOTER  = footer.tmpl	Err	z3bra.org	70
i 	Err	z3bra.org	70
i-PAGES   =   index.html \	Err	z3bra.org	70
i-            2013/08/test-your-css.html \	Err	z3bra.org	70
i+PAGES   = index.html \	Err	z3bra.org	70
i+            2013/08/test-your-css.html \	Err	z3bra.org	70
i             2013/08/the-hard-way.html \	Err	z3bra.org	70
i             2013/09/java-without-eclipse.html \	Err	z3bra.org	70
i             2013/10/home-sweet-home.html \	Err	z3bra.org	70
it@@ -35,4 +37,4 @@ PAGES   =   index.html \	Err	z3bra.org	70
i             2016/09/pack-it-up.html	Err	z3bra.org	70
i 	Err	z3bra.org	70
i FEEDS = rss/feed.xml	Err	z3bra.org	70
i-EXTRA = favicon.ico	Err	z3bra.org	70
i+EXTRA = favicon.ico monochrome.css	Err	z3bra.org	70
1diff --git a/genindex.sh b/genindex.sh	/scm/monochromatic/file/genindex.sh.gph	z3bra.org	70
it@@ -0,0 +1,9 @@	Err	z3bra.org	70
i+#!/bin/sh	Err	z3bra.org	70
i+	Err	z3bra.org	70
i+i=0	Err	z3bra.org	70
i+for post in $(find 20* -type f -name '*.txt' ! -name 'index.txt'|sort); do	Err	z3bra.org	70
i+        title="$(sed -n 's/^# \[\(.*\)\].*$/\1/p' $post)"	Err	z3bra.org	70
i+        href="/${post%.txt}.html"	Err	z3bra.org	70
i+        printf '* 0x%04x - [%s](%s)\n' "$i" "$title" "$href" 	Err	z3bra.org	70
i+        i=$((i+1))	Err	z3bra.org	70
i+done | tac	Err	z3bra.org	70
1diff --git a/index.txt b/index.txt	/scm/monochromatic/file/index.txt.gph	z3bra.org	70
it@@ -1,29 +0,0 @@	Err	z3bra.org	70
i-* 0x001d - [Pack it up!](/2016/09/pack-it-up.html)	Err	z3bra.org	70
i-* 0x001c - [Desktop streaming](/2016/08/desktop-streaming.html)	Err	z3bra.org	70
i-* 0x001b - [Hand-crafted containers](/2016/03/hand-crafted-containers.html)	Err	z3bra.org	70
i-* 0x001a - [Make your own distro](/2016/01/make-your-own-distro.html)	Err	z3bra.org	70
i-* 0x0019 - [Install Alpine at online.net](/2015/08/install-alpine-at-onlinenet.html)	Err	z3bra.org	70
i-* 0x0018 - [cross-compiling with PCC and musl](/2015/08/cross-compiling-with-pcc-and-musl.html)	Err	z3bra.org	70
i-* 0x0017 - [Vomiting colors](/2015/06/vomiting-colors.html)	Err	z3bra.org	70
i-* 0x0016 - [The wrong sysadmin](/2015/04/the-wrong-sysadmin.html)	Err	z3bra.org	70
i-* 0x0015 - [Under Wendy's dress](/2015/03/under-wendys-dress.html)	Err	z3bra.org	70
i-* 0x0014 - [Do you gopher ?](/2015/02/do-you-gopher.html)	Err	z3bra.org	70
i-* 0x0013 - [You are the WM](/2015/01/you-are-the-wm.html)	Err	z3bra.org	70
i-* 0x0012 - [So tox me maybe](/2014/12/so-tox-me-maybe.html)	Err	z3bra.org	70
i-* 0x0011 - [Avoid workspaces](/2014/11/avoid-workspaces.html)	Err	z3bra.org	70
i-* 0x0010 - [Backup, someone ?](/2014/09/backup-someone.html)	Err	z3bra.org	70
i-* 0x000f - [shred config.h](/2014/08/shred-configh.html)	Err	z3bra.org	70
i-* 0x000e - [I'm back up !](/2014/08/im-back-up.html)	Err	z3bra.org	70
i-* 0x000d - [Name that domain](/2014/07/name-that-domain.html)	Err	z3bra.org	70
i-* 0x000c - [Planning downtime](/2014/07/planning-downtime.html)	Err	z3bra.org	70
i-* 0x000b - [Grok that workflow](/2014/05/grok-that-workflow.html)	Err	z3bra.org	70
i-* 0x000a - [Pop it up !](/2014/04/pop-it-up.html)	Err	z3bra.org	70
i-* 0x0009 - [Meeting at the bar](/2014/04/meeting-at-the-bar.html)	Err	z3bra.org	70
i-* 0x0008 - [Toolbox](/2014/03/toolbox.html)	Err	z3bra.org	70
i-* 0x0007 - [Images in terminal](/2014/01/images-in-terminal.html)	Err	z3bra.org	70
i-* 0x0006 - [Love me some LaTex](/2013/12/love-me-some-latex.html)	Err	z3bra.org	70
i-* 0x0005 - [Plain old mails](/2013/11/plain-old-mails.html)	Err	z3bra.org	70
i-* 0x0004 - [Home, sweet home](/2013/10/home-sweet-home.html)	Err	z3bra.org	70
i-* 0x0003 - [Java without Eclipse](/2013/09/java-without-eclipse.html)	Err	z3bra.org	70
i-* 0x0002 - [The Hard way](/2013/08/the-hard-way.html)	Err	z3bra.org	70
i-* 0x0001 - [Test your CSS !](/2013/08/test-your-css.html)	Err	z3bra.org	70
1diff --git a/post.sh b/post.sh	/scm/monochromatic/file/post.sh.gph	z3bra.org	70
it@@ -1,43 +0,0 @@	Err	z3bra.org	70
i-#!/bin/sh	Err	z3bra.org	70
i-	Err	z3bra.org	70
i-# Ask the user for a title	Err	z3bra.org	70
i-if [ $# -lt 1 ]; then	Err	z3bra.org	70
i-        printf "Post title: "	Err	z3bra.org	70
i-        read title	Err	z3bra.org	70
i-else	Err	z3bra.org	70
i-        title="$@"	Err	z3bra.org	70
i-fi	Err	z3bra.org	70
i-	Err	z3bra.org	70
i-# use post title to name the file	Err	z3bra.org	70
i-file=`echo ${title}| tr -d ",.?!;\"'" | tr -s ' ' | tr 'A-Z ' 'a-z-' | sed "s/-*$//"`.txt	Err	z3bra.org	70
i-	Err	z3bra.org	70
i-test -z "$file" && exit 1	Err	z3bra.org	70
i-	Err	z3bra.org	70
i-#date format for the post	Err	z3bra.org	70
i-date=`date +"%d %B, %Y"`	Err	z3bra.org	70
i-	Err	z3bra.org	70
i-# The format of the path to the post, here: /yyyy/mm/	Err	z3bra.org	70
i-folder=`date +%Y/%m`	Err	z3bra.org	70
i-	Err	z3bra.org	70
i-# create the path if it does not exists	Err	z3bra.org	70
i-test -d ${folder} || mkdir -p ${folder}	Err	z3bra.org	70
i-	Err	z3bra.org	70
i-# build the whole path	Err	z3bra.org	70
i-post="${folder}/${file}"	Err	z3bra.org	70
i-	Err	z3bra.org	70
i-# create the file	Err	z3bra.org	70
i-cat <<EOF > ${post}	Err	z3bra.org	70
i-# [${title}](#)	Err	z3bra.org	70
i-## &mdash; ${date}	Err	z3bra.org	70
i-	Err	z3bra.org	70
i-EOF	Err	z3bra.org	70
i-	Err	z3bra.org	70
i-if ! test -f ${post}; then	Err	z3bra.org	70
i-    echo "cannot create ${post}"	Err	z3bra.org	70
i-    exit 1	Err	z3bra.org	70
i-fi	Err	z3bra.org	70
i-	Err	z3bra.org	70
i-echo "$post created (symlinked to last.txt)"	Err	z3bra.org	70
i-	Err	z3bra.org	70
i-# create a symlink to the last post, to easily access it	Err	z3bra.org	70
i-ln -fs ${post} last.txt	Err	z3bra.org	70
1diff --git a/publi.sh b/publi.sh	/scm/monochromatic/file/publi.sh.gph	z3bra.org	70
it@@ -1,24 +0,0 @@	Err	z3bra.org	70
i-#!/bin/sh	Err	z3bra.org	70
i-	Err	z3bra.org	70
i-link=$(ls -l last.txt | sed 's
^.*-> 
/
;s
.txt$
.html
')	Err	z3bra.org	70
i-	Err	z3bra.org	70
i-test -z "$EDITOR" && EDITOR=vi	Err	z3bra.org	70
i-	Err	z3bra.org	70
i-# get last number used (in hexa) and increment it	Err	z3bra.org	70
i-hexa=$(<index.txt cut -d' ' -f2 | sed 's/0x0*//;1q')	Err	z3bra.org	70
i-last=$(printf '%d' "0x${hexa}")	Err	z3bra.org	70
i-next=$(printf "0x%04x" `echo "1 ${last}+p"|dc`)	Err	z3bra.org	70
i-	Err	z3bra.org	70
i-# format our title and put it in a temp file	Err	z3bra.org	70
i-title=$(sed '1s/^# /* '$next' - /;1p;d' < last.txt)	Err	z3bra.org	70
i-echo "$title" | sed "s
(#)
(${link})
" > tmp.txt	Err	z3bra.org	70
i-	Err	z3bra.org	70
i-# present out the final index for reviewing	Err	z3bra.org	70
i-cat index.txt >> tmp.txt	Err	z3bra.org	70
i-sed 10q tmp.txt	Err	z3bra.org	70
i-	Err	z3bra.org	70
i-printf 'Is everything okay? [N/y] '	Err	z3bra.org	70
i-read choice	Err	z3bra.org	70
i-	Err	z3bra.org	70
i-# replace the index with the temp file	Err	z3bra.org	70
i-test "$choice" = "y" && mv tmp.txt index.txt	Err	z3bra.org	70
1diff --git a/tomarkdown.sed b/tomarkdown.sed	/scm/monochromatic/file/tomarkdown.sed.gph	z3bra.org	70
it@@ -1,75 +0,0 @@	Err	z3bra.org	70
i-#!/bin/sed -f	Err	z3bra.org	70
i-	Err	z3bra.org	70
i-# remove header	Err	z3bra.org	70
i-1,/<div id='wrapper'>/d	Err	z3bra.org	70
i-	Err	z3bra.org	70
i-# no more indentation	Err	z3bra.org	70
i-s/^\s*//	Err	z3bra.org	70
i-	Err	z3bra.org	70
i-# reformat titles	Err	z3bra.org	70
i-/<h[1-6][^>]*>/{	Err	z3bra.org	70
i-    $!N	Err	z3bra.org	70
i-    s/<h1[^>]*>\s*\(.*\)\(<\/h1>\)\?/# \1/	Err	z3bra.org	70
i-    s/<h2[^>]*>\s*\(.*\)\(<\/h2>\)\?/## \1/	Err	z3bra.org	70
i-    s/<h3[^>]*>\s*\(.*\)\(<\/h3>\)\?/### \1/	Err	z3bra.org	70
i-    s/<h4[^>]*>\s*\(.*\)\(<\/h4>\)\?/#### \1/	Err	z3bra.org	70
i-    s/<h5[^>]*>\s*\(.*\)\(<\/h5>\)\?/##### \1/	Err	z3bra.org	70
i-    s/<h6[^>]*>\s*\(.*\)\(<\/h6>\)\?/###### \1/	Err	z3bra.org	70
i-}	Err	z3bra.org	70
i-	Err	z3bra.org	70
i-# remove closing title tags	Err	z3bra.org	70
i-/^\s*<\/h[1-6]>\s*$/d	Err	z3bra.org	70
i-s/<\/h[1-6]>//	Err	z3bra.org	70
i-	Err	z3bra.org	70
i-# replace all links/strong/emphasis	Err	z3bra.org	70
i-s/<a href=["']\(.*\)["']>\(.*\)<\/a>/[\2](\1)/	Err	z3bra.org	70
i-s/<\/\?strong>/**/g	Err	z3bra.org	70
i-s/<\/\?em>/_/g	Err	z3bra.org	70
i-	Err	z3bra.org	70
i-# lists	Err	z3bra.org	70
i-/<ul[^>]*>/,/<\/ul>/{	Err	z3bra.org	70
i-    /^\s*<\/\?ul>$/d	Err	z3bra.org	70
i-    s/<li>\(.*\)<\/li>/* \1/	Err	z3bra.org	70
i-}	Err	z3bra.org	70
i-	Err	z3bra.org	70
i-# images	Err	z3bra.org	70
i-/<a class='a_img'/{	Err	z3bra.org	70
i-    $!N	Err	z3bra.org	70
i-    /<img/{	Err	z3bra.org	70
i-        $!N	Err	z3bra.org	70
i-        s/<a class='[a-z_]*' href='\(.*\)'> *\n*\	Err	z3bra.org	70
i-             *<img class='[a-z_]*' src='\(.*\)' alt='\(.*\)'\/> *\n *<\/a>/[![\3](\2)](\1)/	Err	z3bra.org	70
i-    }	Err	z3bra.org	70
i-}	Err	z3bra.org	70
i-	Err	z3bra.org	70
i-# pre formatted text	Err	z3bra.org	70
i-/<pre>/,/<\/pre>/{	Err	z3bra.org	70
i-    s/<\/\?code>//g	Err	z3bra.org	70
i-    s/<\/\?pre>//g	Err	z3bra.org	70
i-    s/^/    /	Err	z3bra.org	70
i-}	Err	z3bra.org	70
i-	Err	z3bra.org	70
i-/<code>/{	Err	z3bra.org	70
i-    $!N	Err	z3bra.org	70
i-    s/<\/\?code>/`/g	Err	z3bra.org	70
i-}	Err	z3bra.org	70
i-	Err	z3bra.org	70
i-# new lines	Err	z3bra.org	70
i-s/<br[\/ ]*>/  /	Err	z3bra.org	70
i-	Err	z3bra.org	70
i-# paragraphs	Err	z3bra.org	70
i-/<p[^>]*>/,/<\/p>/s/<\/\?p>//g	Err	z3bra.org	70
i-	Err	z3bra.org	70
i-# quotes	Err	z3bra.org	70
i-/<blockquote[^>]*>/,/<\/blockquote>/s/^\s*/> /	Err	z3bra.org	70
i-s/<\/\?blockquote>//g	Err	z3bra.org	70
i-/^> $/d	Err	z3bra.org	70
i-	Err	z3bra.org	70
i-# remove simple tag, and span tags	Err	z3bra.org	70
i-#s/<\/\?[A-Za-z0-9]*>//g	Err	z3bra.org	70
i-s/<\/\?span[^>]*>//g	Err	z3bra.org	70
i-s/<\/\?section[^>]*>//g	Err	z3bra.org	70
i-s/<\/\?article[^>]*>//g	Err	z3bra.org	70
i-	Err	z3bra.org	70
i-# remove footer	Err	z3bra.org	70
i-/<\/div>/,$d	Err	z3bra.org	70
.