From 5e8ff1bed36d8e11866f83b67f5f5b5e5af384e0 Mon Sep 17 00:00:00 2001
From: Alexandre Courbot <gnurou@gmail.com>
Date: Mon, 18 Jul 2011 17:19:40 +0900
Subject: [PATCH] Switch to new format

---
 .gitignore                               |  5 ++---
 releasefile.py => createsinglerelease.py |  0
 updatepublic.sh                          | 16 ++++++++--------
 3 files changed, 10 insertions(+), 11 deletions(-)
 rename releasefile.py => createsinglerelease.py (100%)

diff --git a/.gitignore b/.gitignore
index 7213bd555..9414613dd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,5 @@
 *~
 kanjivg.xml
 *.pyc
-kanjivg-????????.xml.gz
-kanjivg
-kanjivgMismatch
+kanjivg-*xml.gz
+kanjivg-*.zip
diff --git a/releasefile.py b/createsinglerelease.py
similarity index 100%
rename from releasefile.py
rename to createsinglerelease.py
diff --git a/updatepublic.sh b/updatepublic.sh
index e0c5b45df..7ddafba09 100755
--- a/updatepublic.sh
+++ b/updatepublic.sh
@@ -1,9 +1,9 @@
 #!/bin/sh
-rm -Rf kanjivg kanjivgMismatch
-./mergexml.py
-outFile="kanjivg-ng-`date +\"%Y%m%d\"`.zip"
-zip -r $outFile kanjivg
-scp $outFile gnurou@gnurou.org:/srv/http/kanjivg/upload/Main/
-#scp Main.StrokeCountMismatch Main.MissingKanji gnurou@gnurou.org:/srv/http/kanjivg/wiki.d
-#ssh gnurou@gnurou.org "cd /srv/http/kanjivg ; rm -Rf currentdata ; tar xfz /home/gnurou/currentdata.tar.gz ; rm /home/gnurou/currentdata.tar.gz ; cd upload/Main ; ln -sf $outFile.gz kanjivg-latest.xml.gz"
-
+d=`date +%Y%m%d`
+outFileOne="kanjivg-$d.xml.gz"
+outFileAll="kanjivg-$d-all.zip"
+zip -r $outFileAll kanji
+python createsinglerelease.py
+gzip -c kanjivg.xml >$outFileOne
+scp $outFileOne $outFileAll gnurou@gnurou.org:/srv/http/kanjivg/upload/Main/
+ssh gnurou@gnurou.org "ln -sf $outFileOne /srv/http/kanjivg/upload/Main/kanjivg-latest.xml.gz"