diff options
Diffstat (limited to 'update')
-rw-r--r-- | update/commit.txt | 2 | ||||
-rwxr-xr-x | update/create_music.sh | 8 | ||||
-rwxr-xr-x | update/createnew.sh | 2 | ||||
-rw-r--r-- | update/musiccommit.txt | 2 | ||||
-rw-r--r-- | update/news.txt | 22 | ||||
-rwxr-xr-x | update/update.sh | 2 | ||||
-rwxr-xr-x | update/update_music.sh | 10 |
7 files changed, 23 insertions, 25 deletions
diff --git a/update/commit.txt b/update/commit.txt index 940e0ff..4dfe390 100644 --- a/update/commit.txt +++ b/update/commit.txt @@ -1 +1 @@ -ae5da0d21d0e937401dfff8a7931087cab6b6db6 +40aa3430330b32fcea9828bfa83ba302dd994ad3 diff --git a/update/create_music.sh b/update/create_music.sh index 151c09e..d40afeb 100755 --- a/update/create_music.sh +++ b/update/create_music.sh @@ -13,14 +13,14 @@ mkdir upload rm files/music.zip cd ../../music -find -iregex ".+[.]\(ogg\)" -exec touch --date=2015-01-01 {} \; -find -iregex ".+[.]\(ogg\)" -printf "%P\n" | zip -X -@ ../tools/update/files/music.zip +find -iregex ".+[.]\(ogg\|mp3\)" -exec touch --date=2015-01-01 {} \; +find -iregex ".+[.]\(ogg\|mp3\)" -printf "%P\n" | zip -X -@ ../tools/update/files/music.zip git log --pretty=oneline -n 1 | awk '{print $1}' >../tools/update/musiccommit.txt cd $dir/files -sum=`adler32 music.zip` | awk '{print $2}' +sum=`adler32 music.zip | awk '{print $2}'` -echo " <update type=\"music\" required=\"no\" file=\"music.zip\" hash=\"${sum}\" description=\"Evol music\" />" >> xml_header.txt +echo " <update type=\"music\" required=\"no\" file=\"music.zip\" hash=\"${sum}\" description=\"TMW-2 music\" />" >> xml_header.txt cp xml_header.txt resources.xml cat xml_footer.txt >>resources.xml diff --git a/update/createnew.sh b/update/createnew.sh index 6f2f07e..10a83b9 100755 --- a/update/createnew.sh +++ b/update/createnew.sh @@ -18,7 +18,7 @@ find -iregex ".+[.]\(xml\|png\|tmx\|ogg\|txt\|po\|tsx\)" -printf "%P\n" | zip -X git log --pretty=oneline -n 1 | awk '{print $1}' >../tools/update/commit.txt cd $dir/files -sum=`adler32 TMW2.zip` | awk '{print $2}' +sum=`adler32 TMW2.zip | awk '{print $2}'` echo "TMW2.zip ${sum}" >resources2.txt echo '<?xml version="1.0"?> diff --git a/update/musiccommit.txt b/update/musiccommit.txt index e5352e1..c91ae16 100644 --- a/update/musiccommit.txt +++ b/update/musiccommit.txt @@ -1 +1 @@ -663e049146ec1c2637338f7834cee445ab653ebb +00bc102b233cf257322e493a675214955285d931 diff --git a/update/news.txt b/update/news.txt index 0afd52d..89a7e08 100644 --- a/update/news.txt +++ b/update/news.txt @@ -1,4 +1,4 @@ -##0 Actual Release: ##1Pilot-V Testing +##0 Actual Release: ##1Pilot-VI Testing ##0 Welcome to ##BTMW-2: Monster World##b! ##0 By playing you agree and abide to the ##1##BTerms of Service##b##0, available at: ##1 [@@https://gitlab.com/TMW2/TheManaWorld_Wiki/wikis/Rules|https://gitlab.com/TMW2/TheManaWorld_Wiki/wikis/Rules@@] @@ -9,27 +9,25 @@ ##2 If you ever run in trouble, try contacting a GM with ##B@request Help me!##b ##2 Please enjoy our server, and have fun! -##7 ##BThe adventure begins!##b +##7 ##BTesting Period will be over at 2018-02-26!##b -##7 Release 1.4: Candy Candy Candy CANDY Candy! +##7 Never miss a release! Follow our [@@https://discord.gg/BQNTe68|Discord Channel@@]! -##1 This is a test release. Everything is subject to change. ALL ACCOUNTS WILL -##1 BE DELETED before official release. This link will expire without prior notice -##1 so ensure to do maximum testing possible! -##5 Planned Release Date is at ##B2018-03-02##b, test-server will go down before. +##1 All accounts and data will be permanently deleted when testing period ends. +##3 Planned Release Date is at ##B2018-03-02##b, test-server will go down before. ##0 Nobody fixed Nard, who suffers from global space and no wait times. -##0 Numerous other issues are also known. We request help from every willing -##0 contributor, talk to us at Discord! +##0 This test server is feature-frozen since 2018-02-16. ##0 We want to express our gratitute here to Saulc, for sponsoring this server. -##0 We also want to thanks everyone who contributed to this game, it would never -##0 have left drawing board without all of you! +##0 We also want to thanks to all testers: Thanks, you've did a great job! +##0 And by last, our gratitute to every developer and contributor who made this possible! -##0 Enjoy testing! +##0 Enjoy testing, official server is coming up soon! ##9 -- Your TMW2 Team ##9 February 2018 +##1 All news from testing period except this one will be deleted upon final release. ##0 You can check out this page for older entries: ##9 [@@http://tmw2.org/news.html|http://tmw2.org/news@@] diff --git a/update/update.sh b/update/update.sh index 7cf8145..768b5c7 100755 --- a/update/update.sh +++ b/update/update.sh @@ -25,7 +25,7 @@ cd $dir/files if [ -f TMW2-${u1}..${u2}.zip ]; then mv ../commit.txt ../commit_old.txt echo ${head} >../commit.txt - sum=`adler32 TMW2-${u1}..${u2}.zip` | awk '{print $2}' + sum=`adler32 TMW2-${u1}..${u2}.zip | awk '{print $2}'` echo "TMW2-${u1}..${u2}.zip ${sum}" >>resources2.txt echo " <update type=\"data\" file=\"TMW2-${u1}..${u2}.zip\" hash=\"${sum}\" />" >> xml_header.txt cp xml_header.txt resources.xml diff --git a/update/update_music.sh b/update/update_music.sh index ac3bbe5..7037be1 100755 --- a/update/update_music.sh +++ b/update/update_music.sh @@ -19,16 +19,16 @@ 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 "[.]\(ogg\)" | sort | uniq | \ -# xargs zip -X -9 -r ../../evol-tools/update/files/music-${u1}..${u2}.zip -exit + grep -e "[.]\(ogg\|mp3\)" | sort | uniq | \ + xargs zip -X -9 -r ../../tools/update/files/music-${u1}..${u2}.zip +#exit cd $dir/files if [ -f music-${u1}..${u2}.zip ]; then mv ../muciscommit.txt ../muciscommit_old.txt echo ${head} >../muciscommit.txt - sum=`adler32 music-${u1}..${u2}.zip` | awk '{print $2}' - echo " <update type=\"music\" required=\"no\" file=\"music-${u1}..${u2}.zip\" hash=\"${sum}\" description=\"TMW2 music\" />" >> xml_header.txt + sum=`adler32 music-${u1}..${u2}.zip | awk '{print $2}'` + echo " <update type=\"music\" required=\"no\" file=\"music-${u1}..${u2}.zip\" hash=\"${sum}\" description=\"TMW2 extra music\" />" >> xml_header.txt cp xml_header.txt resources.xml cat xml_footer.txt >>resources.xml |