Fixed systemd services

Also removed from install script the unnecessarily printed messages.
(all needed information is on the Wiki)

4 files changed, 17 insertions, 34 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9882b6f6c628..02ce8379ec0d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Sat Jul 15 20:21:57 UTC 2017
+# Sat Jul 15 20:23:22 UTC 2017
 pkgbase = deluge-git
 	pkgdesc = A BitTorrent client with multiple user interfaces in a client/server model (git version, 'develop' branch)
 	pkgver = 2.0.0.dev983.g0353b82c0
-	pkgrel = 3
+	pkgrel = 4
 	url = http://deluge-torrent.org/
 	install = deluge.install
 	arch = any
@@ -39,7 +39,7 @@ pkgbase = deluge-git
 	source = deluge-web.service
 	sha256sums = SKIP
 	sha256sums = 58a451bb6cf4fe6ff78a4fb71d51c5910340a2de032ff435c3c7365015ab538f
-	sha256sums = c3f2d6ad5bc9de5ffd9973d92badbe04a9ecf12c0c575e13d505a96add03275a
+	sha256sums = 26e4d01003804afb197c570175d44ed4dddd443cc1b88ab2d0230ceacfac90c5
 
 pkgname = deluge-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 5b396cd1263e..4d34895a2718 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
 
 pkgname=deluge-git
 pkgver=2.0.0.dev983.g0353b82c0
-pkgrel=3
+pkgrel=4
 pkgdesc="A BitTorrent client with multiple user interfaces in a client/server model (git version, 'develop' branch)"
 arch=('any')
 url='http://deluge-torrent.org/'
@@ -37,7 +37,7 @@ source=("$pkgname"::'git://deluge-torrent.org/deluge.git#branch=develop'
         'deluge-web.service')
 sha256sums=('SKIP'
             '58a451bb6cf4fe6ff78a4fb71d51c5910340a2de032ff435c3c7365015ab538f'
-            'c3f2d6ad5bc9de5ffd9973d92badbe04a9ecf12c0c575e13d505a96add03275a')
+            '26e4d01003804afb197c570175d44ed4dddd443cc1b88ab2d0230ceacfac90c5')
 
 prepare() {
     cd "${pkgname}/deluge/ui/data/icons"
@@ -68,8 +68,8 @@ package() {
     install -D -m644 "${srcdir}/deluged.service"    "${pkgdir}/usr/lib/systemd/system/deluged.service"
     install -D -m644 "${srcdir}/deluge-web.service" "${pkgdir}/usr/lib/systemd/system/deluge-web.service"
     
-    install -d       "${pkgdir}/srv"
-    install -d -m664 "${pkgdir}/srv/deluge"
+    install -d                   "${pkgdir}/srv"
+    install -d -m775 -o125 -g125 "${pkgdir}/srv/deluge"
     
     install -D -m644 'deluge/ui/data/pixmaps/deluge.svg' "${pkgdir}/usr/share/pixmaps/deluge.svg"
 }
diff --git a/deluge-web.service b/deluge-web.service
index 7d5445b90ec7..7a77b5c0ed0e 100644
--- a/deluge-web.service
+++ b/deluge-web.service
@@ -4,7 +4,7 @@ After=deluged.service
 
 [Service]
 User=deluge
-ExecStart=/usr/bin/deluge-web
+ExecStart=/usr/bin/deluge-web -d
 
 [Install]
 WantedBy=multi-user.target
diff --git a/deluge.install b/deluge.install
index 4976ccb3889f..ba9e45c6c9a5 100644
--- a/deluge.install
+++ b/deluge.install
@@ -1,32 +1,15 @@
 post_install() {
-    getent passwd deluge &>/dev/null || {
-        echo -n ">>> Creating deluge system user... "
-        useradd --user-group --home /srv/deluge deluge
-        echo "done"
-    }
-    chown deluge:deluge /srv/deluge
-
-    post_upgrade
-
-    cat <<EOF
->>> Daemon: The optional headless daemon started using 'systemctl start deluged'
-    uses the "deluge" user. Its default download directory is /srv/deluge.
-
->>> WebUI: Go to http://localhost:8112/ default-password = "deluge"
-EOF
-}
-
-post_upgrade() {
-    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
+    if ! getent passwd deluge &>/dev/null
+    then
+        groupadd -g 125 deluge
+        useradd -c 'Deluge user' -u 125 -g deluge -d /srv/deluge -s /bin/false deluge
+        passwd -l deluge &>/dev/null
+    fi
 }
 
 post_remove() {
-    getent passwd deluge &>/dev/null && {
-        echo -n ">>> Removing deluge system user... "
+    if getent passwd deluge &>/dev/null
+    then
         userdel deluge
-        groupdel deluge
-        echo "done"
-    }
-    post_upgrade
+    fi
 }