Actually make this package work...

4 files changed, 22 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 967805b7aa05..e1c89b5ba4f5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Sun Apr 16 03:04:06 UTC 2017
+# Sun Apr 16 03:37:45 UTC 2017
 pkgbase = lazylibrarian
 	pkgdesc = Automatic Book Downloading via NZBs & Torrent
 	pkgver = 1.2.0
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/DobyTang/LazyLibrarian
 	install = lazylibrarian.install
 	arch = any
@@ -11,11 +11,11 @@ pkgbase = lazylibrarian
 	depends = python2
 	provides = lazylibrarian
 	conflicts = lazylibrarian-git
-	source = https://github.com/DobyTang/LazyLibrarian/archive/1.2.0.tar.gz
+	source = lazylibrarian-1.2.0.tar.gz::https://github.com/DobyTang/LazyLibrarian/archive/1.2.0.tar.gz
 	source = lazylibrarian.service
 	source = lazylibrarian.sysusers
 	sha256sums = e74313f5e97b37558d102fc87529de4dafd548cc861135ad5112ab6ac9d4bed7
-	sha256sums = 5010608e99e0242ba7c74b401efed0968984fd9a0ba1b9995dca22d6b8da8519
+	sha256sums = ad571025028f86c6fbd867ea32e7d7b78d51f604f0bc3b1e373df642fe6c177c
 	sha256sums = 1e5ee6265af4e4d8beea3cec49cbdba6624a6169edee081aa03de32965d4729d
 
 pkgname = lazylibrarian
diff --git a/PKGBUILD b/PKGBUILD
index 9fdefecc5f77..0e3a45666855 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=lazylibrarian
 pkgver=1.2.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Automatic Book Downloading via NZBs & Torrent"
 arch=('any')
 url="https://github.com/DobyTang/LazyLibrarian"
@@ -12,18 +12,22 @@ install='lazylibrarian.install'
 conflicts=('lazylibrarian-git')
 provides=('lazylibrarian')
 
-source=("https://github.com/DobyTang/LazyLibrarian/archive/${pkgver}.tar.gz"
+source=("${pkgname}-${pkgver}.tar.gz::https://github.com/DobyTang/LazyLibrarian/archive/${pkgver}.tar.gz"
         'lazylibrarian.service'
         'lazylibrarian.sysusers')
 
 sha256sums=('e74313f5e97b37558d102fc87529de4dafd548cc861135ad5112ab6ac9d4bed7'
-            '5010608e99e0242ba7c74b401efed0968984fd9a0ba1b9995dca22d6b8da8519'
+            'ad571025028f86c6fbd867ea32e7d7b78d51f604f0bc3b1e373df642fe6c177c'
             '1e5ee6265af4e4d8beea3cec49cbdba6624a6169edee081aa03de32965d4729d')
 
 package() {
   install -d -m 755 "${pkgdir}/usr/lib/lazylibrarian"
   cp -dpr --no-preserve=ownership "$srcdir/LazyLibrarian-${pkgver}"/* "${pkgdir}/usr/lib/lazylibrarian"
 
+  install -d -m 755 "${pkgdir}/var/lib/lazylibrarian"
+
+  install -d -m 755 "${pkgdir}/etc/lazylibrarian"
+
   install -Dm644 "${srcdir}/lazylibrarian.service" "${pkgdir}/usr/lib/systemd/system/lazylibrarian.service"
   install -Dm644 "${srcdir}/lazylibrarian.sysusers" "${pkgdir}/usr/lib/sysusers.d/lazylibrarian.conf"
 }
diff --git a/lazylibrarian.install b/lazylibrarian.install
index 13665d4c36eb..af877ab24cbd 100644
--- a/lazylibrarian.install
+++ b/lazylibrarian.install
@@ -1,15 +1,13 @@
-CP_USER="lazylibrarian"
-CP_GROUP="lazylibrarian"
-CP_DIR="/var/lib/lazylibrarian"
-
-## arg 1:  the new package version
 post_install() {
   systemd-sysusers lazylibrarian.conf
-  chown -R ${CP_USER}:${CP_GROUP} ${CP_DIR}
-  echo "  >> If you want a custom user or path for LazyLibrarian, remember to edit the service file as well."
+
+  mkdir -p /var/lib/lazylibrarian
+  chown -R lazylibrarian: /var/lib/lazylibrarian
+
+  mkdir -p /etc/lazylibrarian
+  chown -R lazylibrarian: /etc/lazylibrarian
 }
-## arg 1:  the new package version
-## arg 2:  the old package version
+
 post_upgrade() {
-  chown -R ${CP_USER}:${CP_GROUP} ${CP_DIR}
+  chown -R lazylibrarian: /var/lib/lazylibrarian
 }
diff --git a/lazylibrarian.service b/lazylibrarian.service
index adbe3507706e..4c59f779bd98 100644
--- a/lazylibrarian.service
+++ b/lazylibrarian.service
@@ -2,12 +2,11 @@
 Description=LazyLibrarian
 
 [Service]
-ExecStart=/usr/bin/python2 /opt/lazylibrarian/LazyLibrarian.py --daemon --config /opt/lazylibrarian/lazylibrarian.ini --datadir /opt/lazylibrarian/.lazylibrarian --nolaunch --quiet
-GuessMainPID=no
-Type=forking
+ExecStart=/usr/bin/python2 /usr/lib/lazylibrarian/LazyLibrarian.py --config /etc/lazylibrarian/lazylibrarian.ini --datadir /var/lib/lazylibrarian --nolaunch
+Type=simple
 User=lazylibrarian
 Group=lazylibrarian
-Restart=on-failure
+Restart=always
 
 [Install]
 WantedBy=multi-user.target