summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Cooper2015-08-14 10:37:18 -0700
committerMike Cooper2015-08-14 10:37:18 -0700
commit4edd9c5b7e3f6cc6ce0f0e8859ab1d88479caeae (patch)
tree5089821cafd8d81a7f44b0c49f4bda5853b16643
parent418405d445c4a01efea6b85e2e16b1c82a1b7311 (diff)
downloadaur-4edd9c5b7e3f6cc6ce0f0e8859ab1d88479caeae.tar.gz
1.3.0.8-4
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD4
-rw-r--r--terraria-server@.service5
3 files changed, 7 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index c575fb3e8353..2a4ced421362 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -14,7 +14,7 @@ pkgbase = terraria-server
source = terraria-server@.service
sha256sums = 0ab1ee17d78ae1ec039363519840cb1651c6aa22f5a76f014d9cfdca4fb7a333
sha256sums = 8a7e23efe3f72d8c88024cf32e53daa4b293bb2b17070dbf80e86876af1e22f9
- sha256sums = 1c5ffd66b61f34e25ccbe355c8769b37dc338295b7f50961b22b6d6383e31de7
+ sha256sums = 7b871f41d73286ff4fad6cf1f046fc7b1ad0a0d9685baed57e4f97af730b81a8
pkgname = terraria-server
diff --git a/PKGBUILD b/PKGBUILD
index ce1153213939..27c1fdddb56a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
pkgname=terraria-server
pkgver=1.3.0.8
-pkgrel=3
+pkgrel=4
pkgdesc="Official dedicated server for Terraria"
arch=('x86_64' 'x86')
license=('unknown')
@@ -18,7 +18,7 @@ source=("http://terraria.org/server/${pkgname}-linux-${_pkgver}.tar.gz"
sha256sums=('0ab1ee17d78ae1ec039363519840cb1651c6aa22f5a76f014d9cfdca4fb7a333'
'8a7e23efe3f72d8c88024cf32e53daa4b293bb2b17070dbf80e86876af1e22f9'
- '1c5ffd66b61f34e25ccbe355c8769b37dc338295b7f50961b22b6d6383e31de7')
+ '7b871f41d73286ff4fad6cf1f046fc7b1ad0a0d9685baed57e4f97af730b81a8')
package() {
cd "${srcdir}/${pkgname}-linux-${_pkgver}/"
diff --git a/terraria-server@.service b/terraria-server@.service
index 755d0b451127..6f0250285174 100644
--- a/terraria-server@.service
+++ b/terraria-server@.service
@@ -7,7 +7,10 @@ User=terraria
ExecStart=/usr/bin/screen -DmS terraria-%i /usr/bin/terraria-server -config /etc/terraria-server/%i.conf
ExecStop=/usr/bin/screen -p 0 -S terraria-%i -X eval 'stuff "say Server shutting down. Saving world."\\015'
ExecStop=/usr/bin/screen -p 0 -S terraria-%i -X eval 'stuff "exit"\\015'
-ExecStop=/usr/bin/sh -c 'while screen -ls | grep 'terraria-%i' >/dev/null; do sleep 0.1; done'
+# Don't stop process automatically, but still send SIGKILL after a timeout
+KillMode=control-group
+KillSignal=SIGUSR1
+SendSIGKILL=yes
[Install]
WantedBy=multi-user.target