Switch to systemds tmpfiles, move to /usr/lib.

6 files changed, 55 insertions, 67 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 74f96e21871b..4980c36bf2fb 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,21 +1,31 @@
 pkgbase = mylar-git
-	pkgdesc = automated Comic Book downloader for use with SABnzbd, NZBGet and torrents
-	pkgver = r1055.053626a
+	pkgdesc = Comic book downloader for usenet and torrents
+	pkgver = 1072.9c65a0d
 	pkgrel = 1
 	url = https://github.com/evilhero/mylar
-	install = mylar.install
 	arch = i686
 	arch = x86_64
 	license = GPL3
 	makedepends = git
 	depends = python2
+	optdepends = sabnzbd: usenet downloader
+	optdepends = nzbget: usenet downloader
+	optdepends = transmission-cli: torrent downloader (CLI and daemon)
+	optdepends = transmission-gtk: torrent downloader (GTK+)
+	optdepends = transmission-qt: torrent downloader (Qt)
+	optdepends = deluge: torrent downloader
+	optdepends = rtorrent: torrent downloader
+	optdepends = jackett: torrent indexer proxy
 	provides = mylar
 	conflicts = mylar
-	source = mylar-git::git+https://github.com/evilhero/mylar.git
+	options = !strip
+	source = git://github.com/evilhero/mylar.git
 	source = mylar.service
+	source = mylar.tmpfiles
 	source = mylar.sysusers
 	sha256sums = SKIP
-	sha256sums = 20c9b925222113afcdcdbe74a3ca8b6c805ffb42391fff9777c259b26a5b29da
+	sha256sums = 1d840481b2544003e10bc91e7958deabb2692249b251af7c606d025ab8477691
+	sha256sums = 8bd3e83b8fbfc781a44d37af7c2101d061e17cfe61c07e1d2cb75daecca708c8
 	sha256sums = 619a6266ad56e8363296b2ae7e2428c0f433f8c73a57d9bdf55ffba179f6c81d
 
 pkgname = mylar-git
diff --git a/.gitignore b/.gitignore
index 11b533cef576..b2afabad4766 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,6 @@
-# Arch stuff
-pkg/*
-src/*
-*.pkg.tar.*
-
-
-# mylar's repo
-mylar-git/
+/*.rpm
+/*.spk
+/*.xz
+/src/
+/pkg/
+/mylar/
diff --git a/PKGBUILD b/PKGBUILD
index bee25faa06bf..fc9681029b2d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,59 +1,48 @@
 # Maintainer: Zeke Sonxx <zeke@zekesonxx.com>
 pkgname=mylar-git
-pkgver=r1055.053626a
+pkgver=1072.9c65a0d
 pkgrel=1
-pkgdesc="automated Comic Book downloader for use with SABnzbd, NZBGet and torrents"
+pkgdesc="Comic book downloader for usenet and torrents"
 arch=('i686' 'x86_64')
 url="https://github.com/evilhero/mylar"
 license=('GPL3')
-groups=()
 depends=('python2')
+optdepends=('sabnzbd: usenet downloader'
+            'nzbget: usenet downloader'
+            'transmission-cli: torrent downloader (CLI and daemon)'
+            'transmission-gtk: torrent downloader (GTK+)'
+            'transmission-qt: torrent downloader (Qt)'
+            'deluge: torrent downloader'
+            'rtorrent: torrent downloader'
+            'jackett: torrent indexer proxy')
+
 makedepends=('git')
 provides=("mylar")
 conflicts=("mylar")
-replaces=()
-backup=()
-options=()
-install=mylar.install
+options=(!strip)
 
-source=('mylar-git::git+https://github.com/evilhero/mylar.git'
+source=('git://github.com/evilhero/mylar.git'
         'mylar.service'
-        'mylar.sysusers'
-)
-noextract=()
+        'mylar.tmpfiles'
+        'mylar.sysusers')
 
 sha256sums=('SKIP'
-            '20c9b925222113afcdcdbe74a3ca8b6c805ffb42391fff9777c259b26a5b29da'
+            '1d840481b2544003e10bc91e7958deabb2692249b251af7c606d025ab8477691'
+            '8bd3e83b8fbfc781a44d37af7c2101d061e17cfe61c07e1d2cb75daecca708c8'
             '619a6266ad56e8363296b2ae7e2428c0f433f8c73a57d9bdf55ffba179f6c81d')
 
 pkgver() {
-  cd "$srcdir/${pkgname%-VCS}"
-
-  # Git, no tags available
-  printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+  cd "${srcdir}/mylar"
+  echo $(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 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"
+  install -d -m 755 "${pkgdir}/usr/lib/mylar"
+  cp -dr --no-preserve='ownership' "${srcdir}/mylar/" "${pkgdir}/usr/lib/"
+  rm -rf ${pkgdir}/usr/lib/mylar/.git
+  rm -f ${pkgdir}/usr/lib/mylar/.gitignore
+
+  install -D -m 644 "${srcdir}/mylar.service" "${pkgdir}/usr/lib/systemd/system/mylar.service"
+  install -D -m 644 "${srcdir}/mylar.sysusers" "${pkgdir}/usr/lib/sysusers.d/mylar.conf"
+  install -D -m 644 "${srcdir}/mylar.tmpfiles" "${pkgdir}/usr/lib/tmpfiles.d/mylar.conf"
 }
diff --git a/mylar.install b/mylar.install
deleted file mode 100644
index ed81c7767059..000000000000
--- a/mylar.install
+++ /dev/null
@@ -1,14 +0,0 @@
-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
-Config file is at /etc/mylar/config.ini and data is stored in /var/lib/mylar
-No executable, use the systemd unit (# systemd start mylar)
-See https://github.com/evilhero/mylar for more info on configuring it.
-EOF
-}
diff --git a/mylar.service b/mylar.service
index 447f9d07c6ce..4ca76ae17208 100644
--- a/mylar.service
+++ b/mylar.service
@@ -1,11 +1,11 @@
 [Unit]
-Description=Comic Book add-on for SABnzbd+
+Description=Mylar Service
 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
+ExecStart=/usr/bin/python2 /usr/lib/mylar/Mylar.py --nolaunch --config /etc/mylar/config.ini --datadir /var/lib/mylar
 
 [Install]
 WantedBy=multi-user.target
diff --git a/mylar.tmpfiles b/mylar.tmpfiles
new file mode 100644
index 000000000000..07ab8e385cff
--- /dev/null
+++ b/mylar.tmpfiles
@@ -0,0 +1,5 @@
+d /var/lib/mylar 0755 mylar mylar
+Z /var/lib/mylar - mylar mylar
+d /etc/mylar 0755 mylar mylar
+Z /etc/mylar - mylar mylar
+Z /usr/lib/mylar - mylar mylar