Fix systemd service

3 files changed, 18 insertions, 14 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3cea62b487c3..4fd4be2756a5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = mattermost
 	pkgdesc = Open source Slack-alternative in Golang and React
 	pkgver = 5.1.0
-	pkgrel = 1
+	pkgrel = 2
 	url = https://mattermost.com
 	arch = i686
 	arch = x86_64
@@ -27,7 +27,7 @@ pkgbase = mattermost
 	source = mattermost.tmpfiles
 	sha512sums = d9920b8f95d1a3f5ac7ce30f170a2a183d9368d0eeeb4d930d2f8f50c9b92964501b90b3f2ba22180cb558cdee48ec2c74ebb2a28dc37806f185f071316cd8c5
 	sha512sums = a5d89812f573ca595a18f904cb48c43144930e682844d18edbd96e2f2778b5b4e123614f81dfaca978d8b51f56f382becb9d90831280721de5061301a5f12648
-	sha512sums = 893bab002d343ee5cc9a07d6221cc4f00d4d6c9d0adccc9b1bf35619306384fcb1261058c2dd63662f33ae41a62b1d735fa2e3cf50b479709edf272ea58324d1
+	sha512sums = cd02b3da86869117554c3c53a657a4b46989ea533b7b47c24fb642ffbd182ce6ecfb16a8ddde3af4d5e8cff0ab41a932753129662e126994e1ad5912545e6eb4
 	sha512sums = f08d88fd91e91c8b9996cf33699f4a70d69c8c01783cf7add4781ee3c9c6596839e44c5c39f0ff39a836c6d87544eef179f51de0b037ec7f91f86bac8e24d7cc
 	sha512sums = e3ffcf4b86e2ecc7166c1abf92cd4de23d81bad405db0121e513a8d81fea05eec9dd508141b14b208c4c13fbc347c56f01ed91326faa01e872ecdedcc18718f9
 
diff --git a/PKGBUILD b/PKGBUILD
index 4429b1d8572a..400e10433d6a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=mattermost
 pkgver=5.1.0
-pkgrel=1
+pkgrel=2
 pkgdesc='Open source Slack-alternative in Golang and React'
 arch=('i686' 'x86_64' 'arm' 'armv6h' 'armv7h' 'aarch64')
 url='https://mattermost.com'
@@ -28,11 +28,13 @@ source=(
     "${pkgname}.sysusers"
     "${pkgname}.tmpfiles"
 )
-sha512sums=('d9920b8f95d1a3f5ac7ce30f170a2a183d9368d0eeeb4d930d2f8f50c9b92964501b90b3f2ba22180cb558cdee48ec2c74ebb2a28dc37806f185f071316cd8c5'
-            'a5d89812f573ca595a18f904cb48c43144930e682844d18edbd96e2f2778b5b4e123614f81dfaca978d8b51f56f382becb9d90831280721de5061301a5f12648'
-            '893bab002d343ee5cc9a07d6221cc4f00d4d6c9d0adccc9b1bf35619306384fcb1261058c2dd63662f33ae41a62b1d735fa2e3cf50b479709edf272ea58324d1'
-            'f08d88fd91e91c8b9996cf33699f4a70d69c8c01783cf7add4781ee3c9c6596839e44c5c39f0ff39a836c6d87544eef179f51de0b037ec7f91f86bac8e24d7cc'
-            'e3ffcf4b86e2ecc7166c1abf92cd4de23d81bad405db0121e513a8d81fea05eec9dd508141b14b208c4c13fbc347c56f01ed91326faa01e872ecdedcc18718f9')
+sha512sums=(
+    'd9920b8f95d1a3f5ac7ce30f170a2a183d9368d0eeeb4d930d2f8f50c9b92964501b90b3f2ba22180cb558cdee48ec2c74ebb2a28dc37806f185f071316cd8c5'
+    'a5d89812f573ca595a18f904cb48c43144930e682844d18edbd96e2f2778b5b4e123614f81dfaca978d8b51f56f382becb9d90831280721de5061301a5f12648'
+    'cd02b3da86869117554c3c53a657a4b46989ea533b7b47c24fb642ffbd182ce6ecfb16a8ddde3af4d5e8cff0ab41a932753129662e126994e1ad5912545e6eb4'
+    'f08d88fd91e91c8b9996cf33699f4a70d69c8c01783cf7add4781ee3c9c6596839e44c5c39f0ff39a836c6d87544eef179f51de0b037ec7f91f86bac8e24d7cc'
+    'e3ffcf4b86e2ecc7166c1abf92cd4de23d81bad405db0121e513a8d81fea05eec9dd508141b14b208c4c13fbc347c56f01ed91326faa01e872ecdedcc18718f9'
+)
 
 prepare() {
     # cp cannot copy from a symbolic link to the destination link itself
@@ -130,6 +132,7 @@ package() {
     cd "${srcdir}"/src/github.com/${pkgname}/${pkgname}-server
 
     install -dm755 \
+        "${pkgdir}"/usr/bin \
         "${pkgdir}"/usr/share/webapps \
         "${pkgdir}"/var/log/${pkgname} \
         "${pkgdir}"/etc/webapps \
@@ -154,8 +157,9 @@ package() {
     mv NOTICE.txt README.md "${pkgdir}"/usr/share/doc/${pkgname}
 
     cd "${srcdir}"
-    install -Dm755 bin/${pkgname} "${pkgdir}"/usr/bin/${pkgname}
-    install -Dm644 ${pkgname}.service -t "${pkgdir}"/usr/lib/systemd/system/
-    install -Dm644 ${pkgname}.sysusers "${pkgdir}"/usr/lib/sysusers.d/${pkgname}.conf
-    install -Dm644 ${pkgname}.tmpfiles "${pkgdir}"/usr/lib/tmpfiles.d/${pkgname}.conf
+    install -Dm755 "bin/${pkgname}" "${pkgdir}/usr/share/webapps/${pkgname}/bin/${pkgname}"
+    ln -s "/usr/share/webapps/${pkgname}/bin/${pkgname}" "${pkgdir}/usr/bin/${pkgname}"
+    install -Dm644 "${pkgname}.service" -t "${pkgdir}/usr/lib/systemd/system/"
+    install -Dm644 "${pkgname}.sysusers" "${pkgdir}/usr/lib/sysusers.d/${pkgname}.conf"
+    install -Dm644 "${pkgname}.tmpfiles" "${pkgdir}/usr/lib/tmpfiles.d/${pkgname}.conf"
 }
diff --git a/mattermost.service b/mattermost.service
index fc460ba6ea35..82de14a3f7cf 100644
--- a/mattermost.service
+++ b/mattermost.service
@@ -7,8 +7,8 @@ After=postgresql.service
 Type=simple
 User=mattermost
 Group=mattermost
-ExecStart=/usr/bin/mattermost
-WorkingDirectory=/usr/share/webapps/mattermost
+ExecStart=mattermost
+WorkingDirectory=/usr/share/webapps/mattermost/bin/
 
 Restart=on-failure
 PrivateTmp=false