move from /home to /srv and some other improvements from deluge-git

3 files changed, 36 insertions, 20 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 27e45f5f98ac..56de935e3ee1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,12 +1,11 @@
 pkgbase = flickmagnet
 	pkgdesc = HTTP server similar to Netflix and PopcornTime which streams public domain videos from torrent files.
 	pkgver = 0.0.5
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/acerix/flickmagnet
 	install = flickmagnet.install
 	arch = any
 	license = MIT
-	depends = python
 	depends = python-xdg
 	depends = python-daemonocle
 	depends = python-libtorrent-rasterbar
@@ -17,8 +16,8 @@ pkgbase = flickmagnet
 	depends = python-beautifulsoup4
 	source = https://github.com/acerix/flickmagnet/archive/0.0.5.tar.gz
 	source = flickmagnet.install
-	sha256sums = SKIP
-	sha256sums = 3bd07df2978ac25f1cd96eb1631f48d865d4719c694fd5d6cccd91ba37148c3b
+	sha256sums = 02d21988cdb6cdfe30b3f9279651d1af6a5d7776cc7fc731b42c09a8d3c83fcd
+	sha256sums = 1302a620549a96cd6a942e107052b3f94a70d9c135c77b8c46f1ad38edb9b228
 
 pkgname = flickmagnet
 
diff --git a/PKGBUILD b/PKGBUILD
index 646a3f7f70d6..80d5425bc0c3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,14 +3,13 @@
 pkgname='flickmagnet'
 _gitname='flickmagnet'
 pkgver='0.0.5'
-pkgrel=1
+pkgrel=2
 pkgdesc='HTTP server similar to Netflix and PopcornTime which streams public domain videos from torrent files.'
 arch=('any')
 url='https://github.com/acerix/flickmagnet'
 license=('MIT')
 
 depends=(
-    'python'
     'python-xdg'
     'python-daemonocle'
     'python-libtorrent-rasterbar'
@@ -27,14 +26,20 @@ source=(
     flickmagnet.install
 )
 sha256sums=(
-    'SKIP'
-    '3bd07df2978ac25f1cd96eb1631f48d865d4719c694fd5d6cccd91ba37148c3b'
+    '02d21988cdb6cdfe30b3f9279651d1af6a5d7776cc7fc731b42c09a8d3c83fcd'
+    '1302a620549a96cd6a942e107052b3f94a70d9c135c77b8c46f1ad38edb9b228'
 )
 
+build() {
+    cd "$_gitname-$pkgver"
+    python setup.py build
+}
+
 package() {
     cd "$_gitname-$pkgver"
     python setup.py install --root="$pkgdir/" --optimize=1
     install -Dm755 "$pkgname.sh" "$pkgdir/usr/bin/$pkgname"
+    install -dm664 "$pkgdir/srv/$pkgname"
     install -Dm644 "$pkgname/examples/$pkgname.service" "$pkgdir/usr/lib/systemd/system/$pkgname.service"
 }
 
diff --git a/flickmagnet.install b/flickmagnet.install
index 8bbb66605937..69d8a94c50cb 100644
--- a/flickmagnet.install
+++ b/flickmagnet.install
@@ -1,23 +1,35 @@
 
 post_install() {
-
-    # create system user and group to run the daemon
-    getent group flickmagnet > /dev/null || groupadd -g 420 flickmagnet &>/dev/null
-    getent passwd flickmagnet > /dev/null || useradd -u 420 -g 420 -m -s /bin/false flickmagnet &>/dev/null
-
+    getent passwd flickmagnet &>/dev/null || {
+        echo -n ">>> Adding user... "
+        useradd --user-group --home /srv/flickmagnet -u 420 -s /bin/false flickmagnet
+        echo "done"
+    }
+    chown flickmagnet:flickmagnet /srv/flickmagnet
+
+    cat <<EOF
+>>> Start the daemon with 'systemctl start flickmagnet'
+    It uses the "deluge" user with files stored in /srv/flickmagnet
+
+>>> Give the daemon 10 minutes to find some content, then browse to http://localhost:42000/
+EOF
 }
 
 post_remove() {
-
-    # delete the system user and group
-    getent passwd flickmagnet > /dev/null && userdel -r flickmagnet &>/dev/null
-    getent group flickmagnet > /dev/null && groupdel flickmagnet &>/dev/null
-
+    getent passwd deluge &>/dev/null && {
+        echo -n ">>> Deleting user... "
+        userdel flickmagnet
+        groupdel flickmagnet
+        echo "done"
+    }
 }
 
 post_upgrade() {
 
-    echo "** Flick Magnet doesn't have graceful upgrades yet, delete user files to reinitialize:"
-    echo "rm -r ~/.config/flickmagnet/ ~/.cache/flickmagnet/ ~/.local/share/flickmagnet/"
+    echo -n ">>> Flick Magnet doesn't have graceful upgrades yet, delete user files to reinitialize: "
+    echo -n "rm -r ~/.config/flickmagnet/ ~/.cache/flickmagnet/ ~/.local/share/flickmagnet/ "
+
+    systemctl daemon-reload
 
 }
+