Update to 9.1

2 files changed, 27 insertions, 24 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5379ec490e2b..16292cbdf98e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = teeworlds-ddnet
 	pkgdesc = A customized version by DDRaceNetwork of this 2D shooting game
-	pkgver = 9.0.2
-	pkgrel = 2
+	pkgver = 9.1
+	pkgrel = 1
 	url = http://ddnet.tw
 	arch = i686
 	arch = x86_64
@@ -13,17 +13,16 @@ pkgbase = teeworlds-ddnet
 	depends = sdl
 	depends = freetype2
 	depends = openssl098
-	optdepends = teeworlds-ddnet-skins: extra skins
 	provides = teeworlds
-	provides = teeworlds-ddnet-skins
 	conflicts = teeworlds
-	conflicts = teeworlds-ddnet-skins
 	source = teeworlds-ddnet.png
 	md5sums = 41465eb3a4ecf2e7f7afe5a5f0c84386
-	source_i686 = http://ddnet.tw/downloads/DDNet-9.0.2-linux_x86.tar.gz
-	md5sums_i686 = 2c1d4934d9f8dbf56370a090ad291f95
-	source_x86_64 = http://ddnet.tw/downloads/DDNet-9.0.2-linux_x86_64.tar.gz
-	md5sums_x86_64 = c07dda0f99bd57bc6b1f6683143b18b4
+	source = http://ddnet.tw/skins/zip/database.zip
+	md5sums = SKIP
+	source_i686 = http://ddnet.tw/downloads/DDNet-9.1-linux_x86.tar.gz
+	md5sums_i686 = 83f94cb8622ebf7c90cc58318a45fae7
+	source_x86_64 = http://ddnet.tw/downloads/DDNet-9.1-linux_x86_64.tar.gz
+	md5sums_x86_64 = 01cc3930abd203d970b5abaa64c6b558
 
 pkgname = teeworlds-ddnet
 
diff --git a/PKGBUILD b/PKGBUILD
index e55be0f0b60a..0ad1ac0baf78 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,24 +1,26 @@
-# Maintainer: josephgbr <rafael.f.f1@gmail.com>
+# Maintainer: josephgbr <rffontenelle@gmail.com>
 
 pkgname=teeworlds-ddnet
-pkgver=9.0.2
-pkgrel=2
+pkgver=9.1
+pkgrel=1
 pkgdesc="A customized version by DDRaceNetwork of this 2D shooting game"
 arch=('i686' 'x86_64')
 url="http://ddnet.tw"
 license=('custom')
 depends=('alsa-lib' 'glu' 'sdl' 'freetype2' 'openssl098')
-optdepends=('teeworlds-ddnet-skins: extra skins')
 makedepends=('gendesk' 'unzip')
-provides=('teeworlds' 'teeworlds-ddnet-skins')
-conflicts=('teeworlds' 'teeworlds-ddnet-skins')
-         # PNG converted from DDNet.ico from https://github.com/def-/ddnet
-source=(teeworlds-ddnet.png)
+provides=('teeworlds')
+conflicts=('teeworlds')
+         # PNG converted from DDNet.ico from https://github.com/ddnet/ddnet
+source=(teeworlds-ddnet.png
+        "$url/skins/zip/database.zip")
 source_i686=("$url/downloads/DDNet-$pkgver-linux_x86.tar.gz")
 source_x86_64=("$url/downloads/DDNet-$pkgver-linux_x86_64.tar.gz")
-md5sums=('41465eb3a4ecf2e7f7afe5a5f0c84386')
-md5sums_i686=('2c1d4934d9f8dbf56370a090ad291f95')
-md5sums_x86_64=('c07dda0f99bd57bc6b1f6683143b18b4')
+md5sums=('41465eb3a4ecf2e7f7afe5a5f0c84386'
+         'SKIP')
+md5sums_i686=('83f94cb8622ebf7c90cc58318a45fae7')
+md5sums_x86_64=('01cc3930abd203d970b5abaa64c6b558')
+noextract=('database.zip')
 
 # Check hashs manually (replace $pkgver):
 # curl -sL http://ddnet.tw/downloads/md5sums | grep -E DDNet-$pkgver-linux
@@ -27,11 +29,11 @@ prepare() {
   gendesk -f -n --pkgname "$pkgname" --pkgdesc "$pkgdesc" \
     --name 'Teeworlds' --categories 'Game;ArcadeGame'
   
-  # Download latest collection of the Skin Database from DDNet site (~ 1.5 MB)
+  # Unzip latest collection of the Skin Database from DDNet site (~ 1.5 MB)
   # See: http://ddnet.tw/skins/
-  rm -fR database.dir database.zip
-  curl -O http://ddnet.tw/skins/zip/database.zip 
+  rm -fR database.dir
   unzip -q database.zip
+  rm -fR database.zip
 }
 
 package() {
@@ -40,7 +42,9 @@ package() {
     # Install binaries
   install -Dm755 DDNet "$pkgdir"/usr/bin/teeworlds-ddnet
   install -Dm755 DDNet-Server "$pkgdir"/usr/bin/teeworlds-ddnet_srv
-  install -Dm755 dilate "$pkgdir"/usr/bin/dilate
+  install -Dm755 dilate "$pkgdir"/usr/bin/ddnet-dilate
+  install -Dm755 config_store "$pkgdir"/usr/bin/ddnet-config_store
+  install -Dm755 config_retrieve "$pkgdir"/usr/bin/ddnet-config_retrieve
 
     # Install data files
   mkdir -p "$pkgdir"/usr/share/teeworlds/data