mirror of
https://git.ludikovsky.name/git/fugitive.git
synced 2024-10-05 15:35:29 +02:00
Fixed preproc and article title problem
This commit is contained in:
parent
9f158aef2b
commit
5bee51b29e
20
html-gen.sh
20
html-gen.sh
|
@ -190,7 +190,7 @@ replace_commit_info() {
|
||||||
}
|
}
|
||||||
|
|
||||||
replace_article_info() {
|
replace_article_info() {
|
||||||
article_title="$2"
|
article_title=`get_article_title "$1"`
|
||||||
article_cdatetime=`get_article_info "%ai" "$1" | tail -1`
|
article_cdatetime=`get_article_info "%ai" "$1" | tail -1`
|
||||||
article_cdatetime_html5=`echo "$article_cdatetime" | \
|
article_cdatetime_html5=`echo "$article_cdatetime" | \
|
||||||
sed "s/ /T/;s/ \(+\|-\)\([0-9][0-9]\)/\1\2:/"`
|
sed "s/ /T/;s/ \(+\|-\)\([0-9][0-9]\)/\1\2:/"`
|
||||||
|
@ -286,20 +286,24 @@ replace_foreach () {
|
||||||
|
|
||||||
generate_article() {
|
generate_article() {
|
||||||
art="${1#$articles_dir/}"
|
art="${1#$articles_dir/}"
|
||||||
article_title=`get_article_title "$art"`
|
title=`get_article_title "$art"`
|
||||||
if [ "$preproc" != "" ]; then
|
if [ "$preproc" != "" ]; then
|
||||||
preproc_bak=`mktemp -p "$articles_dir"`
|
body=`get_article_content "$art"`
|
||||||
mv "$1" "$preproc_bak"
|
echo "$title" > "$1"
|
||||||
($preproc) < "$preproc_bak" > "$1"
|
($preproc) < "$body" >> "$1"
|
||||||
fi
|
fi
|
||||||
cat "$templates_dir/article.html" | \
|
cat "$templates_dir/article.html" | \
|
||||||
replace_includes | \
|
replace_includes | \
|
||||||
replace_str "page_title" "$article_title" | \
|
replace_str "page_title" "$title" | \
|
||||||
replace_str "blog_url" "$blog_url" | \
|
replace_str "blog_url" "$blog_url" | \
|
||||||
replace_commit_info "-1" | \
|
replace_commit_info "-1" | \
|
||||||
replace_article_info "$art" "$article_title" | \
|
replace_article_info "$art" | \
|
||||||
sed "/^[[:space:]]*$/d" > "$public_dir/$art.html"
|
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() {
|
regenerate_previous_and_next_article_maybe() {
|
||||||
|
|
Loading…
Reference in a new issue