Add mylar user and group using systemd, other various improvements.

5 files changed, 46 insertions, 34 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 28d4e392c834..a0cae11f102a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = mylar-git
 	pkgdesc = automated Comic Book downloader for use with SABnzbd, NZBGet and torrents
-	pkgver = r632.8082a61
+	pkgver = r828.3fa3cfe
 	pkgrel = 1
 	url = https://github.com/evilhero/mylar
 	install = mylar.install
@@ -13,10 +13,10 @@ pkgbase = mylar-git
 	conflicts = mylar
 	source = mylar-git::git+https://github.com/evilhero/mylar.git
 	source = mylar.service
-	md5sums = SKIP
-	md5sums = 08513f5d6eebd4d2beba454361cd55ac
+	source = mylar.sysusers
 	sha256sums = SKIP
-	sha256sums = 35d90980145bb8665e2b8bb8e9d196fbeaab881ea98b92b7eaa73277f429ae16
+	sha256sums = 20c9b925222113afcdcdbe74a3ca8b6c805ffb42391fff9777c259b26a5b29da
+	sha256sums = 619a6266ad56e8363296b2ae7e2428c0f433f8c73a57d9bdf55ffba179f6c81d
 
 pkgname = mylar-git
 
diff --git a/PKGBUILD b/PKGBUILD
index c6a35792e78f..7feb97d16cb2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Zeke Sonxx <zeke@zekesonxx.com>
 pkgname=mylar-git
-pkgver=r632.8082a61
+pkgver=r828.3fa3cfe
 pkgrel=1
 pkgdesc="automated Comic Book downloader for use with SABnzbd, NZBGet and torrents"
 arch=('i686' 'x86_64')
@@ -15,42 +15,45 @@ replaces=()
 backup=()
 options=()
 install=mylar.install
-source=('mylar-git::git+https://github.com/evilhero/mylar.git' 'mylar.service')
+
+source=('mylar-git::git+https://github.com/evilhero/mylar.git'
+        'mylar.service'
+        'mylar.sysusers'
+)
 noextract=()
-md5sums=('SKIP'
-         '08513f5d6eebd4d2beba454361cd55ac')
+
 sha256sums=('SKIP'
-            '35d90980145bb8665e2b8bb8e9d196fbeaab881ea98b92b7eaa73277f429ae16')
+            '20c9b925222113afcdcdbe74a3ca8b6c805ffb42391fff9777c259b26a5b29da'
+            '619a6266ad56e8363296b2ae7e2428c0f433f8c73a57d9bdf55ffba179f6c81d')
 
 pkgver() {
-	cd "$srcdir/${pkgname%-VCS}"
+  cd "$srcdir/${pkgname%-VCS}"
 
-# Git, no tags available
-	printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+  # Git, no tags available
+  printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
 
 
 package() {
-	# this would be in prepare() but prepare is run before pkgver and that needs to not happen
-	cd "$srcdir/$pkgname"
-
-	rm -rf "$srcdir/$pkgname/.git" # remove unneeded git info
-	rm -r "screens" # the screenshots for the GitHub page
-	rm README.md # not needed
-	rm API_REFERENCE # look it up on github if you want to use it
-
-	cd "$pkgdir"
-	# copy stuff over
-	mkdir -p "$pkgdir/usr/share/"
-	cp -r "$srcdir/mylar-git/" "$pkgdir/usr/share/mylar/"
-	rm -rf "$pkgdir/usr/share/mylar/.git"
-
-	# fix permissions
-	chmod -R 755 "$pkgdir/usr/share/mylar"
-
-	# install everything else
-	install -D -m644 "$srcdir/mylar.service" "$pkgdir/usr/lib/systemd/system/mylar.service"
-	mkdir -p "$pkgdir/etc/mylar"
-	mkdir -p "$pkgdir/var/lib/mylar"
-
+  # this would be in prepare() but prepare is run before pkgver and that needs to not happen
+  cd "$srcdir/$pkgname"
+
+  rm -rf "$srcdir/$pkgname/.git" # remove unneeded git info
+  rm README.md # not needed
+  rm API_REFERENCE # look it up on github if you want to use it
+
+  cd "$pkgdir"
+  # copy stuff over
+  mkdir -p "$pkgdir/usr/share/"
+  cp -r "$srcdir/mylar-git/" "$pkgdir/usr/share/mylar/"
+  rm -rf "$pkgdir/usr/share/mylar/.git"
+
+  # fix permissions
+  chmod -R 755 "$pkgdir/usr/share/mylar"
+
+  # install everything else
+  install -D -m644 "${srcdir}/mylar.service" "${pkgdir}/usr/lib/systemd/system/mylar.service"
+  install -D -m644 "${srcdir}/mylar.sysusers" "${pkgdir}/usr/lib/sysusers.d/mylar.conf"
+  mkdir -p "${pkgdir}/etc/mylar"
+  mkdir -p "${pkgdir}/var/lib/mylar"
 }
diff --git a/mylar.install b/mylar.install
index 6d8e78ba65bc..ed81c7767059 100644
--- a/mylar.install
+++ b/mylar.install
@@ -1,4 +1,9 @@
 post_install() {
+  systemd-sysusers mylar.conf
+
+  chown -R mylar: /var/lib/mylar
+  chown -R mylar /etc/mylar
+
   echo <<EOF
 mylar requires a ComicVine API key to really function
 Input the API key using the web interface
diff --git a/mylar.service b/mylar.service
index d3b862bd48aa..447f9d07c6ce 100644
--- a/mylar.service
+++ b/mylar.service
@@ -1,7 +1,10 @@
 [Unit]
 Description=Comic Book add-on for SABnzbd+
+After=network.target
 
 [Service]
+User=mylar
+Group=mylar
 ExecStart=/usr/bin/python2 /usr/share/mylar/Mylar.py --nolaunch --config /etc/mylar/config.ini --datadir /var/lib/mylar
 
 [Install]
diff --git a/mylar.sysusers b/mylar.sysusers
new file mode 100644
index 000000000000..d9dc75ff15d8
--- /dev/null
+++ b/mylar.sysusers
@@ -0,0 +1 @@
+u mylar - "mylar" /var/lib/mylar