summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2012-01-15 21:40:03 +0300
committerAndrei Karas <akaras@inbox.ru>2012-01-15 21:40:03 +0300
commitfda4350bc00ed2df52e6c2b28a2ac75d8bda8f32 (patch)
tree6ea6d5b2240aa2369d27ca2a1b01d641faff28eb
parent55201f2eb9afe3d3e5e7483470e59a915f37eb4b (diff)
downloadevol-tools-fda4350bc00ed2df52e6c2b28a2ac75d8bda8f32.tar.gz
evol-tools-fda4350bc00ed2df52e6c2b28a2ac75d8bda8f32.tar.bz2
evol-tools-fda4350bc00ed2df52e6c2b28a2ac75d8bda8f32.tar.xz
evol-tools-fda4350bc00ed2df52e6c2b28a2ac75d8bda8f32.zip
update: update scripts for update files generation.
-rw-r--r--update/commit.txt2
-rw-r--r--update/commit_old.txt1
-rwxr-xr-xupdate/createnew.sh11
-rwxr-xr-xupdate/update.sh9
4 files changed, 14 insertions, 9 deletions
diff --git a/update/commit.txt b/update/commit.txt
index 4adcf49..bf67516 100644
--- a/update/commit.txt
+++ b/update/commit.txt
@@ -1 +1 @@
-eff497c18ba3132ac7169028c7cec33f834b0e88
+1b2dc21c886a8b53fb82b9a58016512f483bef45
diff --git a/update/commit_old.txt b/update/commit_old.txt
deleted file mode 100644
index b22f28c..0000000
--- a/update/commit_old.txt
+++ /dev/null
@@ -1 +0,0 @@
-76d576f6d275d3bbcf10fe8a4aabf505353b3e0a
diff --git a/update/createnew.sh b/update/createnew.sh
index 2a057ec..6cd182c 100755
--- a/update/createnew.sh
+++ b/update/createnew.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-# Copyright (C) 2011 Evol Online
+# Copyright (C) 2011-2012 Evol Online
# Author: Andrei Karas (4144)
dir=`pwd`
@@ -8,10 +8,13 @@ dir=`pwd`
rm adler32
gcc -lz adler32.c -o adler32
+mkdir files
+mkdir upload
+
rm files/evol.zip
-cd ../../clientdata
-find -iregex ".+[.]\(xml\|png\|tmx\|ogg\|txt\)" -printf "%P\n" | zip -@ ../evol-tools/update/files/evol.zip
-git log --pretty=oneline -n 1 | awk '{print $1}' >../evol-tools/update/commit.txt
+cd ../../gittorious/clientdata-beta
+find -iregex ".+[.]\(xml\|png\|tmx\|ogg\|txt\)" -printf "%P\n" | zip -@ ../../privtools/update/files/evol.zip
+git log --pretty=oneline -n 1 | awk '{print $1}' >../../privtools/update/commit.txt
cd $dir/files
sum=`../adler32 1 evol.zip`
diff --git a/update/update.sh b/update/update.sh
index 2e560b6..e881f87 100755
--- a/update/update.sh
+++ b/update/update.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-# Copyright (C) 2010-2011 Evol Online
+# Copyright (C) 2010-2012 Evol Online
# Author: Andrei Karas (4144)
dir=`pwd`
@@ -8,15 +8,18 @@ dir=`pwd`
rm adler32
gcc -lz adler32.c -o adler32
+mkdir files
+mkdir upload
+
previous=`cat commit.txt`
-cd ../../clientdata
+cd ../../gittorious/clientdata-beta
head=`git log --pretty=oneline -n 1 | awk '{print $1}'`
u1=`echo ${previous} | cut -c 1-7`
u2=`echo ${head} | cut -c 1-7`
git log --name-status ${previous}..${head} | awk '/^(A|M)\t/ {print $2}' | \
grep -e "[.]\(xml\|png\|tmx\|ogg\|txt\)" | sort | uniq | \
- xargs zip -9 -r ../evol-tools/update/files/evol-${u1}..${u2}.zip
+ xargs zip -9 -r ../../privtools/update/files/evol-${u1}..${u2}.zip
cd $dir/files
if [ -f evol-${u1}..${u2}.zip ]; then