assaultcube-reloaded: 2.18.2

4 files changed, 42 insertions, 32 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 284384705dda..f0a7205af411 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = assaultcube-reloaded
 	pkgdesc = AssaultCube Reloaded
-	pkgver = 2.7
-	pkgrel = 2
+	pkgver = 2.18.2
+	pkgrel = 1
 	url = http://acr.victorz.ca
 	arch = i686
 	arch = x86_64
@@ -15,14 +15,14 @@ pkgbase = assaultcube-reloaded
 	depends = sdl
 	depends = sdl_image
 	depends = zlib
-	source = https://github.com/actf/acr/archive/v2.7.tar.gz
+	source = https://github.com/actf/acr/archive/v2.18.2.tar.gz
 	source = acreloaded
 	source = acreloaded-server
 	source = acreloaded.desktop
 	source = acreloaded.svg
-	md5sums = 8ef9f42706153f4d60a918a0f892d811
-	md5sums = c6db5816ce66282f6d6c7d08792b6095
-	md5sums = 53b17712afb7f0a5646b9894032d06ff
+	md5sums = 6ee80508b35cc0ea1d8b44f537f9b32c
+	md5sums = 8ab0b28867ade9fd720167443ada886a
+	md5sums = 21e8ad1669ed0d54331dcec2d9569688
 	md5sums = faf59a6be0054bcc09a4a01df7eb8e6c
 	md5sums = 3b142417157d73da4a7981fd07bcb628
 
diff --git a/PKGBUILD b/PKGBUILD
index bcbcbab6ad3e..48f4cd302da0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,41 +1,47 @@
 # Maintainer: robertfoster
 
 pkgname=assaultcube-reloaded
-pkgver=2.7
-pkgrel=2
+pkgver=2.18.2
+pkgrel=1
 pkgdesc='AssaultCube Reloaded'
 arch=('i686' 'x86_64')
 url='http://acr.victorz.ca'
 license=('ZLIB')
 depends=('curl' 'gcc-libs' 'libgl' 'libvorbis' 'libx11' 'openal' 'sdl' 'sdl_image' 'zlib')
 source=("https://github.com/actf/acr/archive/v${pkgver}.tar.gz"
-    'acreloaded'
-    'acreloaded-server'
-    'acreloaded.desktop'
-    'acreloaded.svg'
+  'acreloaded'
+  'acreloaded-server'
+  'acreloaded.desktop'
+  'acreloaded.svg'
 )
 
 package() {
-    install -d "${pkgdir}"/usr/bin
-    install -d "${pkgdir}"/usr/share/acreloaded
-    cd ${srcdir}/acr-${pkgver}
-    cd  source/src
+  cd "${srcdir}/acr-${pkgver}/source/src"
 
-    make DESTDIR=$pkgdir install
-    cd ../..
+  install -d "${pkgdir}/usr/bin"
+  install -d "${pkgdir}/usr/share/acreloaded"
+  make DESTDIR="${pkgdir}" install
 
-    cp -rf bot config packages acr/packages ${pkgdir}/usr/share/acreloaded
+  cd "${srcdir}/acr-${pkgver}"
+  cp -rf bot config packages acr/packages \
+    "${pkgdir}/usr/share/acreloaded"
 
-    install -Dm755 bin_unix/native_client ${pkgdir}/usr/share/acreloaded/native_client
-    install -Dm755 bin_unix/native_server ${pkgdir}/usr/share/acreloaded/native_server
-    install -Dm644 ${srcdir}/acreloaded.svg ${pkgdir}/usr/share/pixmaps/acreloaded.svg
-    install -Dm644 ${srcdir}/acreloaded.desktop ${pkgdir}/usr/share/applications/acreloaded.desktop
-    install -Dm755 ${srcdir}/acreloaded ${pkgdir}/usr/bin/acreloaded
-    install -Dm755 ${srcdir}/acreloaded-server ${pkgdir}/usr/bin/acreloaded-server
+  install -Dm755 bin_unix/native_client \
+    "${pkgdir}/usr/share/acreloaded/native_client"
+  install -Dm755 bin_unix/native_server \
+    "${pkgdir}/usr/share/acreloaded/native_server"
+  install -Dm644 "${srcdir}/acreloaded.svg" \
+    "${pkgdir}/usr/share/pixmaps/acreloaded.svg"
+  install -Dm644 "${srcdir}/acreloaded.desktop" \
+    "${pkgdir}/usr/share/applications/acreloaded.desktop"
+  install -Dm755 "${srcdir}/acreloaded" \
+    "${pkgdir}/usr/bin/acreloaded"
+  install -Dm755 "${srcdir}/acreloaded-server" \
+    "${pkgdir}/usr/bin/acreloaded-server"
 }
 
-md5sums=('8ef9f42706153f4d60a918a0f892d811'
-    'c6db5816ce66282f6d6c7d08792b6095'
-    '53b17712afb7f0a5646b9894032d06ff'
-    'faf59a6be0054bcc09a4a01df7eb8e6c'
-'3b142417157d73da4a7981fd07bcb628')
+md5sums=('6ee80508b35cc0ea1d8b44f537f9b32c'
+         '8ab0b28867ade9fd720167443ada886a'
+         '21e8ad1669ed0d54331dcec2d9569688'
+         'faf59a6be0054bcc09a4a01df7eb8e6c'
+         '3b142417157d73da4a7981fd07bcb628')
diff --git a/acreloaded b/acreloaded
index c1055fecbf38..aa2a60212114 100644
--- a/acreloaded
+++ b/acreloaded
@@ -1,4 +1,8 @@
 #!/bin/bash
 
 cd /usr/share/acreloaded
-./native_client "--home=${HOME}/.acreloaded" "--init=${HOME}/.acreloaded/config/init.cfg" "$@"
+
+./native_client \
+  --home="${HOME}/.acreloaded" \
+  --init="${HOME}/.acreloaded/config/init.cfg" \
+  "$@"
diff --git a/acreloaded-server b/acreloaded-server
index 2989b7bdd479..41ba7aa2f1a8 100644
--- a/acreloaded-server
+++ b/acreloaded-server
@@ -1,4 +1,4 @@
 #!/bin/bash
 
-cd /usr/share/acreloaded/
+cd /usr/share/acreloaded
 ./native_server "$@"