diff options
author | Sebastien Duthil | 2016-08-30 23:43:18 -0400 |
---|---|---|
committer | Sebastien Duthil | 2016-08-30 23:43:18 -0400 |
commit | 48b1ff682b2c1425ad199f437f901446e2c907ab (patch) | |
tree | 2db5ab3899b0734861614075c262686c7669c648 | |
parent | cba9a2992c10bab5c1398dad61e4e6bc76893207 (diff) | |
download | aur-48b1ff682b2c1425ad199f437f901446e2c907ab.tar.gz |
fix 0.13.19 changes
Thanks to mickael9 for the list of fixes!
-rw-r--r-- | .SRCINFO | 7 | ||||
-rw-r--r-- | PKGBUILD | 8 | ||||
-rw-r--r-- | factorio-headless.conf | 4 | ||||
-rw-r--r-- | factorio-headless.install | 2 | ||||
-rw-r--r-- | factorio-headless.service | 2 |
5 files changed, 12 insertions, 11 deletions
@@ -1,7 +1,7 @@ pkgbase = factorio-headless pkgdesc = A 2D game about building and maintaining factories - Server version pkgver = 0.13.19 - pkgrel = 1 + pkgrel = 2 url = http://www.factorio.com/ install = factorio-headless.install arch = x86_64 @@ -9,6 +9,7 @@ pkgbase = factorio-headless conflicts = factorio conflicts = factorio-demo conflicts = factorio-experimental + conflicts = factorio-headless-experimental backup = etc/conf.d/factorio source = LICENSE source = factorio-headless.service @@ -16,8 +17,8 @@ pkgbase = factorio-headless source = factorio-headless.sysusers source = factorio_headless_x64_0.13.19.tar.gz::http://www.factorio.com/get-download/0.13.19/headless/linux64 sha256sums = 67ec2f88afff5d7e0ca5fd3301b5d98655269c161a394368fa0ec49fbc0c0e21 - sha256sums = 9df38b60238a3c1400b668f8f5a379c4870dfde5c638e49474a20ca97f9568f0 - sha256sums = 2f14f5b6e89a158c9e65e2aba8cfbf3c0be0df414698f4ef5da950eb72c347a4 + sha256sums = b6b3d8421abf5ccd1e26618c354eaf1b56bbf39b19beef4358a02740d9871947 + sha256sums = 476423af51eda76154e6da5a0a73695744e1251730a89d3f657068e5175418fe sha256sums = 87dae15d1bcfb4683faea9c66498bd916bd27f8aa0dc724c4e21076dcf17da64 sha256sums = 9e773b1758fb184997532b1577b21d7c8775966c77f7e7cec82cfe728a18a444 @@ -3,12 +3,12 @@ pkgname=factorio-headless pkgver=0.13.19 -pkgrel=1 +pkgrel=2 pkgdesc="A 2D game about building and maintaining factories - Server version" arch=('x86_64') url="http://www.factorio.com/" license=('custom: commercial') -conflicts=('factorio' 'factorio-demo' 'factorio-experimental') +conflicts=('factorio' 'factorio-demo' 'factorio-experimental' 'factorio-headless-experimental') install=factorio-headless.install backup=(etc/conf.d/factorio) source=(LICENSE @@ -17,8 +17,8 @@ source=(LICENSE factorio-headless.sysusers factorio_headless_x64_${pkgver}.tar.gz::http://www.factorio.com/get-download/${pkgver}/headless/linux64) sha256sums=('67ec2f88afff5d7e0ca5fd3301b5d98655269c161a394368fa0ec49fbc0c0e21' - '9df38b60238a3c1400b668f8f5a379c4870dfde5c638e49474a20ca97f9568f0' - '2f14f5b6e89a158c9e65e2aba8cfbf3c0be0df414698f4ef5da950eb72c347a4' + 'b6b3d8421abf5ccd1e26618c354eaf1b56bbf39b19beef4358a02740d9871947' + '476423af51eda76154e6da5a0a73695744e1251730a89d3f657068e5175418fe' '87dae15d1bcfb4683faea9c66498bd916bd27f8aa0dc724c4e21076dcf17da64' '9e773b1758fb184997532b1577b21d7c8775966c77f7e7cec82cfe728a18a444') diff --git a/factorio-headless.conf b/factorio-headless.conf index 6b6c59257cdc..1ece65794d1d 100644 --- a/factorio-headless.conf +++ b/factorio-headless.conf @@ -9,6 +9,6 @@ AUTOSAVE_INTERVAL=10 AUTOSAVE_SLOTS=3 # Additional factorio arguments -FACTORIO_EXTRA_ARGS="--disallow-commands --peer-to-peer" +FACTORIO_EXTRA_ARGS="--allow-commands admins-only" -SAVE_NAME=factorio-service-save +SAVE_FILE=/var/lib/factorio/.factorio/saves/factorio-service-save.zip diff --git a/factorio-headless.install b/factorio-headless.install index 7ec95408ea66..bd82f5012451 100644 --- a/factorio-headless.install +++ b/factorio-headless.install @@ -3,7 +3,7 @@ post_install() { [[ -d /var/lib/factorio ]] || install -dm 770 -o factorio -g games /var/lib/factorio # create empty game - [[ -f /var/lib/factorio/.factorio/saves/factorio-service-save.zip ]] || su - factorio -s /bin/sh -c 'factorio --create factorio-service-save 2>&1 >/dev/null' + [[ -f /var/lib/factorio/.factorio/saves/factorio-service-save.zip ]] || su - factorio -s /bin/sh -c 'factorio --create /var/lib/factorio/.factorio/saves/factorio-service-save.zip 2>&1 >/dev/null' } post_upgrade() { diff --git a/factorio-headless.service b/factorio-headless.service index f8981450146e..4bf4d05ef65c 100644 --- a/factorio-headless.service +++ b/factorio-headless.service @@ -7,7 +7,7 @@ After=network.target User=factorio EnvironmentFile=/etc/conf.d/factorio TimeoutStartSec=5 -ExecStart=/usr/bin/factorio --start-server $SAVE_NAME --autosave-interval $AUTOSAVE_INTERVAL --autosave-slots $AUTOSAVE_SLOTS --latency-ms $LATENCY $FACTORIO_EXTRA_ARGS +ExecStart=/usr/bin/factorio --start-server $SAVE_FILE --autosave-interval $AUTOSAVE_INTERVAL --autosave-slots $AUTOSAVE_SLOTS --latency-ms $LATENCY $FACTORIO_EXTRA_ARGS TimeoutStopSec=10 KillSignal=SIGINT RestartSec=10 |