From 04f376ccc937a4b35593fb6206a9c8cb6332f220 Mon Sep 17 00:00:00 2001
From: Gordian Edenhofer <gordian.edenhofer@gmail.com>
Date: Fri, 4 Mar 2016 18:36:18 +0100
Subject: [PATCH] Upgpkg: 1.9-3

Fix faulty systemd unit files with wrong use of environment variables.
---
 .SRCINFO                  | 6 +++---
 PKGBUILD                  | 6 +++---
 minecraftd-backup.service | 4 ++--
 minecraftd.service        | 5 ++---
 4 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/.SRCINFO b/.SRCINFO
index e48517c..476627a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = minecraft-server
 	pkgdesc = Minecraft server unit files, script, and jar
 	pkgver = 1.9
-	pkgrel = 2
+	pkgrel = 3
 	url = http://minecraft.net/
 	install = minecraft-server.install
 	arch = any
@@ -24,9 +24,9 @@ pkgbase = minecraft-server
 	source = minecraftd.conf
 	source = minecraftd.sh
 	md5sums = ff68834eee875bcf367422c67673207c
-	md5sums = f75c76446f96311563e87fc688148501
+	md5sums = 09e94951d2c2fcf5afab890cdd51dacb
 	md5sums = fef6fadd0739ae03ff71ba61025be207
-	md5sums = cab358c32dd0d4d2463e60ee2996f658
+	md5sums = 53f7e807bd53f32be2f0c6c06b249f63
 	md5sums = 54438e0c47cc5083e0a4376688b46092
 	md5sums = 4f11b1efd6941ea894ca0497824201cf
 
diff --git a/PKGBUILD b/PKGBUILD
index f159169..53b138e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=minecraft-server
 pkgver=1.9
-pkgrel=2
+pkgrel=3
 pkgdesc="Minecraft server unit files, script, and jar"
 arch=('any')
 url="http://minecraft.net/"
@@ -24,9 +24,9 @@ source=("https://s3.amazonaws.com/Minecraft.Download/versions/${pkgver}/minecraf
 	"minecraftd.sh")
 noextract=("minecraft_server.${pkgver}.jar")
 md5sums=('ff68834eee875bcf367422c67673207c'
-         'f75c76446f96311563e87fc688148501'
+         '09e94951d2c2fcf5afab890cdd51dacb'
          'fef6fadd0739ae03ff71ba61025be207'
-         'cab358c32dd0d4d2463e60ee2996f658'
+         '53f7e807bd53f32be2f0c6c06b249f63'
          '54438e0c47cc5083e0a4376688b46092'
          '4f11b1efd6941ea894ca0497824201cf')
 
diff --git a/minecraftd-backup.service b/minecraftd-backup.service
index 20fae70..f5e98c1 100644
--- a/minecraftd-backup.service
+++ b/minecraftd-backup.service
@@ -6,8 +6,8 @@ After=local-fs.target
 Type=forking
 EnvironmentFile=/etc/conf.d/minecraft
 ExecStart=/usr/bin/minecraftd backup
-USER=$MC_USER
-GROUP=$MC_USER
+USER=minecraft
+GROUP=minecraft
 
 [Install]
 WantedBy=multi-user.target
diff --git a/minecraftd.service b/minecraftd.service
index 45bae6e..bfc5a95 100644
--- a/minecraftd.service
+++ b/minecraftd.service
@@ -4,11 +4,10 @@ After=local-fs.target network.target
 
 [Service]
 Type=forking
-EnvironmentFile=/etc/conf.d/minecraft
 ExecStart=/usr/bin/minecraftd start
 ExecStop=/usr/bin/minecraftd stop
-USER=$MC_USER
-GROUP=$MC_USER
+USER=minecraft
+GROUP=minecraft
 
 [Install]
 WantedBy=multi-user.target