From 5bee51b29ef94310afa4dceb5ea432dfc2888d2a Mon Sep 17 00:00:00 2001
From: p4bl0 <r@uzy.me>
Date: Sat, 9 Jul 2011 18:36:11 +0200
Subject: Fixed preproc and article title problem

---
 html-gen.sh | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

(limited to 'html-gen.sh')

diff --git a/html-gen.sh b/html-gen.sh
index 6a05253..d96cc38 100644
--- a/html-gen.sh
+++ b/html-gen.sh
@@ -190,7 +190,7 @@ replace_commit_info() {
 }
 
 replace_article_info() {
-  article_title="$2"
+  article_title=`get_article_title "$1"`
   article_cdatetime=`get_article_info "%ai" "$1" | tail -1`
   article_cdatetime_html5=`echo "$article_cdatetime" | \
     sed "s/ /T/;s/ \(+\|-\)\([0-9][0-9]\)/\1\2:/"`
@@ -286,20 +286,24 @@ replace_foreach () {
 
 generate_article() {
   art="${1#$articles_dir/}"
-  article_title=`get_article_title "$art"`
+  title=`get_article_title "$art"`
   if [ "$preproc" != "" ]; then
-    preproc_bak=`mktemp -p "$articles_dir"`
-    mv "$1" "$preproc_bak"
-    ($preproc) < "$preproc_bak" > "$1"
+    body=`get_article_content "$art"`
+    echo "$title" > "$1"
+    ($preproc) < "$body" >> "$1"
   fi
   cat "$templates_dir/article.html" | \
     replace_includes | \
-    replace_str "page_title" "$article_title" | \
+    replace_str "page_title" "$title" | \
     replace_str "blog_url" "$blog_url" | \
     replace_commit_info "-1" | \
-    replace_article_info "$art" "$article_title" | \
+    replace_article_info "$art" | \
     sed "/^[[:space:]]*$/d" > "$public_dir/$art.html"
-  if [ "$preproc" != "" ]; then mv "$preproc_bak" "$1"; fi
+  if [ "$preproc" != "" ]; then
+    echo "$title" > "$1"
+    cat "$body" >> "$1"
+    rm "$body"
+  fi
 }
 
 regenerate_previous_and_next_article_maybe() {
-- 
cgit v1.2.3