X-Git-Url: https://git.phdru.name/?p=phdru.name%2Fphdru.name.git;a=blobdiff_plain;f=make-files;h=a43d782cb4e162ced61786c4d8b33be2e9b3deb9;hp=e5aa6d5d123e5ffbe3ec4860484ff86c8e771bcc;hb=HEAD;hpb=331965859222bca39a7fc251cdc93830620c8a4a diff --git a/make-files b/make-files index e5aa6d5..a43d782 100755 --- a/make-files +++ b/make-files @@ -5,8 +5,8 @@ PYTHONPATH=. PYTHONIOENCODING=koi8-r:replace export PYTHONPATH PYTHONIOENCODING -if [ phd_site.tmpl -nt phd_site.py ]; then - cheetah compile --encoding=koi8-r --settings='encoding="koi8-r"' --nobackup phd_site.tmpl && +if [ \! -e phd_site.py -o phd_site.tmpl -nt phd_site.py ]; then + python2.7 `which cheetah` compile --encoding=koi8-r --settings='encoding="koi8-r"' --nobackup phd_site.tmpl && compyle phd_site.py fi && @@ -14,7 +14,8 @@ for tmpl in "$@"; do dir="`dirname \"$tmpl\"`" outfile="`basename \"$tmpl\" .tmpl`.html" echo "$tmpl => $dir/$outfile" - cheetah fill --encoding=koi8-r --settings='encoding="koi8-r"' \ - --nobackup --stdout "$tmpl" | iconv -f utf-8 -t koi8-r >"$dir/$outfile" || exit 1 + python2.7 `which cheetah` fill --encoding=koi8-r --settings='encoding="koi8-r"' \ + --nobackup --stdout "$tmpl" | iconv -c -f utf-8 -t koi8-r >"$dir/$outfile" || exit 1 done +exec sitemap_gen.py --config=sitemaps/phdru.name-config.xml