diff options
| author | p4bl0 <pablo@rauzy.name> | 2010-07-22 19:46:59 +0200 |
|---|---|---|
| committer | p4bl0 <pablo@rauzy.name> | 2010-07-22 19:46:59 +0200 |
| commit | dc6e4181842e2cf13aebc8434deee57b0d25a769 (patch) | |
| tree | fbc84df56535258e08abaab2cfb41b24ea9eb995 | |
| parent | 9cde723e88cb115e3c8c419e1c9538bb3841394f (diff) | |
now using xml preprocessor intruction <?fugitive VAR ?> for templating instead of xml comment <!--VAR-->, thanks a3_nm for the idea
| -rw-r--r-- | src/article.html | 21 | ||||
| -rw-r--r-- | src/post-commit.sh | 6 |
2 files changed, 14 insertions, 13 deletions
diff --git a/src/article.html b/src/article.html index 3c4eeaa..78cb77f 100644 --- a/src/article.html +++ b/src/article.html @@ -2,13 +2,13 @@ <!DOCTYPE html> <html dir="ltr" xml:lang="en-US" xmlns="http://www.w3.org/1999/xhtml"> <head> - <title>p4bl0's blog: <!--article_title--></title> + <title>p4bl0's blog: <?fugitive article_title ?></title> <meta http-equiv="Content-type" content="application/xhtml+xml; charset=utf-8" /> <meta name="author" content="Pablo Rauzy" /> <meta name="description" content="p4bl0 (Pablo Rauzy)'s blog" /> <meta name="keywords" content="p4bl0, pablo, rauzy, blog, geek, student, ens, normale sup, computer science, programming, language" /> <link rel="icon" type="image/png" href="/images/icons/pablo.png" /> - <link rel="stylesheet" href="/styles/fugitive.css" type="text/css" media="screen" charset="utf-8" /> + <link rel="stylesheet" href="fugitive.css" type="text/css" media="screen" charset="utf-8" /> </head> <body> @@ -26,16 +26,17 @@ <div id="content"> <article> <header> - <h2><!--article_title--></h2> + <h2><?fugitive article_title ?></h2> </header> <footer> - by <!--commit_author-->, on - <time datetime="<!--commit_datetime-->"><!--commit_date--> at - <!--commit_time--></time>. + by <?fugitive commit_author ?>, on + <time datetime="<?fugitive commit_datetime ?>"> + <?fugitive commit_date ?> at + <?fugitive commit_time ?></time>. </footer> </header> <div> - <!--article_content--> + <?fugitive article_content ?> </div> </article> </div> @@ -50,9 +51,9 @@ hosted at <a href="http://berthold.shebang.ws/">berthold</a>'s </p> <p> - last commit was <!--commit_hash-->, - at <time><!--commit_datetime--></time>, - <q><!--commit_subject--></q>. + last commit was <?fugitive commit_hash ?>, + at <time><?fugitive commit_datetime ?></time>, + <q><?fugitive commit_subject ?></q>. </p> </footer> </div> diff --git a/src/post-commit.sh b/src/post-commit.sh index 55c1ef5..a153632 100644 --- a/src/post-commit.sh +++ b/src/post-commit.sh @@ -19,7 +19,7 @@ commit_Hash=`git log -1 --format="%H"` commit_hash=`git log -1 --format="%h"` commit_author=`git log -1 --format="%an"` commit_author_email=`git log -1 --format="%ae" | sed "s/@/[at]/;s/\./(dot)/"` -commit_datetime=`git log -1 --format="%ai" | cut -d' ' -f1,2` +commit_datetime=`git log -1 --format="%ai"` commit_date=`git log -1 --format="%ad" --date="short"` commit_time=`git log -1 --format="%ai" | cut -d' ' -f2` commit_timestamp=`git log -1 --format="%at"` @@ -43,10 +43,10 @@ article_get_content() { } replace_var_by_string() { - sed "s/<\!--$1-->/$2/" + sed "s/<?fugitive\s\+$1\s*?>/$2/" } replace_var_by_file() { - sed "/<\!--$1-->/ { + sed "/<?fugitive\s\+$1\s*?>/ { r $2 d }" } |