From be44b397717062005e3c47990656bf291a4a19cb Mon Sep 17 00:00:00 2001 From: Neale Pickett Date: Wed, 14 Mar 2012 17:51:20 -0500 Subject: [PATCH] complete template filename change --- Makefile | 4 ++-- g.cgi.c | 2 +- tartans/design.cgi | 2 +- template.xml => template.m4 | 19 +++++++------------ toys/crunt.cgi | 2 +- toys/smalltalk.cgi | 2 +- 6 files changed, 13 insertions(+), 18 deletions(-) rename template.xml => template.m4 (51%) diff --git a/Makefile b/Makefile index a884f17..52bcf1c 100644 --- a/Makefile +++ b/Makefile @@ -7,10 +7,10 @@ MDWNTOHTML = ./mdwntohtml $(TEMPLATE) HTML = index.html # Things to copy -COPY += mdwntohtml template.xml +COPY += mdwntohtml $(TEMPLATE) COPY += face.png chumby-photo.cgi COPY += format.css default.css print.css -COPY += gitweb.cgi git-logo.png gitweb.css gitweb.conf +#COPY += gitweb.cgi git-logo.png gitweb.css gitweb.conf COPY += portal.png portal.cgi COPY += g.cgi cgitrc cgit-header.html cgit.css diff --git a/g.cgi.c b/g.cgi.c index d9ef443..b45ff54 100644 --- a/g.cgi.c +++ b/g.cgi.c @@ -5,7 +5,7 @@ int main(int argc, char *argv[]) { setenv("CGIT_CONFIG", "/home/neale/public_html/cgitrc", 1); - execl("/usr/local/src/cgit/cgit-stable/cgit", "cgit", NULL); + execl("/usr/local/bin/cgit", "cgit", NULL); return 0; } diff --git a/tartans/design.cgi b/tartans/design.cgi index 089a37d..2791d4c 100755 --- a/tartans/design.cgi +++ b/tartans/design.cgi @@ -34,7 +34,7 @@ else: sys.stdout.flush() content = ('Name: %s\nSett: %s\n' % (t, s)) png = 'design.cgi?sett=%s' % urllib.quote(s_) - cvt = os.popen('./tartantomdwn %s tartan.m4 | ../mdwntohtml ../template.xml' % (png,), + cvt = os.popen('./tartantomdwn %s tartan.m4 | ../mdwntohtml ../template.m4' % (png,), 'w') cvt.write(content) cvt.close() diff --git a/template.xml b/template.m4 similarity index 51% rename from template.xml rename to template.m4 index a55b7e5..c45bf0d 100644 --- a/template.xml +++ b/template.m4 @@ -1,17 +1,12 @@ - - - + + TITLE - - - - - + + + + + diff --git a/toys/crunt.cgi b/toys/crunt.cgi index efe3aaf..6db3359 100755 --- a/toys/crunt.cgi +++ b/toys/crunt.cgi @@ -30,4 +30,4 @@ echo done echo 'CRUNT!' echo '

' -) | m4 -DTITLE=crunt ../template.xml - +) | m4 -DTITLE=crunt ../template.m4 - diff --git a/toys/smalltalk.cgi b/toys/smalltalk.cgi index f984540..f70620d 100755 --- a/toys/smalltalk.cgi +++ b/toys/smalltalk.cgi @@ -111,4 +111,4 @@ echo echo '---' echo echo 'Reload for a new letter!' -) | ../mdwntohtml ../template.xml +) | ../mdwntohtml ../template.m4