From 47b0884966fe1dfa14dea026a3811e0088a9214f Mon Sep 17 00:00:00 2001 From: Oleg Broytman Date: Wed, 15 Mar 2006 15:20:04 +0000 Subject: [PATCH] Changed the number and the order of parameters. git-svn-id: file:///home/phd/archive/SVN/phdru.name/scripts@29 7bb0bf08-9e0d-0410-b083-99cee3bf18b8 --- Makefile | 4 ++-- make-news.py | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 3e4ba37..835200a 100644 --- a/Makefile +++ b/Makefile @@ -26,10 +26,10 @@ phd_pp_ru.py: phd_pp_ru.tmpl news: ../htdocs/phd.pp.ru/news.tmpl ../htdocs/phd.pp.ru/Russian/news.tmpl ../htdocs/phd.pp.ru/news.tmpl: news_en - @(umask 022; PYTHONPATH=.; export PYTHONPATH; ./make-news.py en '' ../htdocs/phd.pp.ru/news.tmpl) + @(umask 022; PYTHONPATH=.; export PYTHONPATH; ./make-news.py en ../htdocs/phd.pp.ru) ../htdocs/phd.pp.ru/Russian/news.tmpl: news_ru - @(umask 022; PYTHONPATH=.; export PYTHONPATH; ./make-news.py ru Russian ../htdocs/phd.pp.ru/Russian/news.tmpl) + @(umask 022; PYTHONPATH=.; export PYTHONPATH; ./make-news.py ru ../htdocs/phd.pp.ru/Russian) .PHONY: blog diff --git a/make-news.py b/make-news.py index 9556322..a1169ed 100755 --- a/make-news.py +++ b/make-news.py @@ -11,7 +11,6 @@ import sys, os from news import get_news, write_if_changed header, news_items = get_news(sys.argv[1]) -root_dir = sys.argv[2] new_text = [header] @@ -30,4 +29,4 @@ new_text.append("""\ $phd_pp_ru.respond(self) """) -write_if_changed(sys.argv[3], ''.join(new_text)) +write_if_changed(os.path.join(sys.argv[2], "news.tmpl"), ''.join(new_text)) -- 2.39.2