Improve bazarr-git aur package:

* Switch back to native python2
* Install to /usr/lib/bazaar
* Add Radarr to description
* Add .gitignore
* Control permissions w/ tmpfiles
* Remove bash script, run directly from service file

8 files changed, 81 insertions, 76 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6d6b9a15bfe6..b7835ef72696 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,40 +1,42 @@
 pkgbase = bazarr-git
-	pkgdesc = Manage and download subtitles for Sonarr.
-	pkgver = r444.c64c4ce
+	pkgdesc = Manage and download subtitles for Sonarr and Radarr.
+	pkgver = r489.d130adf
 	pkgrel = 1
 	url = https://github.com/morpheus65535/bazarr
-	install = bazarr.install
 	arch = any
 	license = GPL3
 	makedepends = git
-	depends = python
-	depends = python-apscheduler
-	depends = python-babelfish
-	depends = python-bottle
-	depends = python-bottle-fdsend
-	depends = python-dogpile.cache
-	depends = python-enzyme
-	depends = python-gitpython
-	depends = python-pillow
-	depends = python-py-pretty
-	depends = python-pycountry
-	depends = python-requests
+	depends = python2
 	depends = subliminal
-	depends = python-tzlocal
-	depends = python-urllib3
-	depends = python-waitress
-	depends = python-langdetect
-	depends = python-apprise
+	depends = python2-apprise
+	depends = python2-apscheduler
+	depends = python2-babelfish
+	depends = python2-bottle
+	depends = python2-bottle-fdsend
+	depends = python2-dogpile.cache
+	depends = python2-enzyme
+	depends = python2-gitpython
+	depends = python2-langdetect
+	depends = python2-logutils
+	depends = python2-pillow
+	depends = python2-py-pretty
+	depends = python2-pycountry
+	depends = python2-pytz
+	depends = python2-requests
+	depends = python2-tzlocal
+	depends = python2-urllib3
+	depends = python2-waitress
+	depends = python2-webtest
 	provides = bazarr
 	conflicts = bazarr
 	source = git+https://github.com/morpheus65535/bazarr
-	source = bazarr.sh
 	source = bazarr.service
 	source = bazarr.sysusers
+	source = bazarr.tmpfiles
 	sha256sums = SKIP
-	sha256sums = 47f59d5acf0df99d8dabfec617fdc57d7620d7843ce871dedc7f46cdae9c7420
-	sha256sums = a87cb97e29a72b6fa7c8e48b5044a8dd70efea717ef8991c3bd11fb848b31166
-	sha256sums = 288dbffb34c13cc6e3d599144138dd5d0de2ef40807649e3641669a0cb0788fa
+	sha256sums = e3c57f1a1d9ddd87d097efe2df5148f10de79c445fe6eee158f64b4335f3e174
+	sha256sums = 92fd48cbd7e5fe3a0388bbe756a52098fc461ef2dc87d9e886452e4f15acdcdc
+	sha256sums = 2087276827bb090edf8743d5debfcc22a0c434b36d3b680bbea85dbd9a3b4539
 
 pkgname = bazarr-git
 
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..55a3414c90b2
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,6 @@
+/*.rpm
+/*.spk
+/*.xz
+/src/
+/pkg/
+/bazarr/
diff --git a/PKGBUILD b/PKGBUILD
index add85df59082..2e7d29dd6c41 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,58 +2,59 @@
 
 _pkgname=bazarr
 pkgname=$_pkgname-git
-pkgver=r444.c64c4ce
+pkgver=r489.d130adf
 pkgrel=1
-pkgdesc="Manage and download subtitles for Sonarr."
+pkgdesc="Manage and download subtitles for Sonarr and Radarr."
 arch=('any')
 url="https://github.com/morpheus65535/bazarr"
 license=('GPL3')
-depends=('python'
-         'python-apscheduler'
-         'python-babelfish'
-         'python-bottle'
-         'python-bottle-fdsend'
-         'python-dogpile.cache'
-         'python-enzyme'
-         'python-gitpython'
-         'python-pillow'
-         'python-py-pretty'
-         'python-pycountry'
-         'python-requests'
+depends=('python2'
          'subliminal'
-         'python-tzlocal'
-         'python-urllib3'
-         'python-waitress'
-         'python-langdetect'
-         'python-apprise')
+         'python2-apprise'
+         'python2-apscheduler'
+         'python2-babelfish'
+         'python2-bottle'
+         'python2-bottle-fdsend'
+         'python2-dogpile.cache'
+         'python2-enzyme'
+         'python2-gitpython'
+         'python2-langdetect'
+         'python2-logutils'
+         'python2-pillow'
+         'python2-py-pretty'
+         'python2-pycountry'
+         'python2-pytz'
+         'python2-requests'
+         'python2-tzlocal'
+         'python2-urllib3'
+         'python2-waitress'
+         'python2-webtest')
+
 makedepends=('git')
 provides=("$_pkgname")
 conflicts=("$_pkgname")
-install=$_pkgname.install
-source=("git+https://github.com/morpheus65535/bazarr"
-        "bazarr.sh"
-        "bazarr.service"
-        "bazarr.sysusers")
+source=('git+https://github.com/morpheus65535/bazarr'
+        'bazarr.service'
+        'bazarr.sysusers'
+        'bazarr.tmpfiles')
+
 sha256sums=('SKIP'
-            '47f59d5acf0df99d8dabfec617fdc57d7620d7843ce871dedc7f46cdae9c7420'
-            'a87cb97e29a72b6fa7c8e48b5044a8dd70efea717ef8991c3bd11fb848b31166'
-            '288dbffb34c13cc6e3d599144138dd5d0de2ef40807649e3641669a0cb0788fa')
+            'e3c57f1a1d9ddd87d097efe2df5148f10de79c445fe6eee158f64b4335f3e174'
+            '92fd48cbd7e5fe3a0388bbe756a52098fc461ef2dc87d9e886452e4f15acdcdc'
+            '2087276827bb090edf8743d5debfcc22a0c434b36d3b680bbea85dbd9a3b4539')
 
 pkgver() {
   cd "$_pkgname"
   printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
 
-prepare() {
-  cd "$_pkgname"
-  sed -i "/reload\|setdefaultencoding/d" bazarr.py
-  /usr/bin/2to3 -w -n .
-}
-
 package() {
-  install -dm755 "${pkgdir}/usr/share"
-  cp -dpr --no-preserve=ownership bazarr "${pkgdir}/usr/share/bazarr"
-  install -Dm755 bazarr.sh "${pkgdir}/usr/bin/bazarr"
-  install -Dm644 bazarr.service "${pkgdir}/usr/lib/systemd/system/bazarr.service"
-  install -Dm644 bazarr.sysusers "$pkgdir/usr/lib/sysusers.d/bazarr.conf"
+  install -d -m 755 "${pkgdir}/usr/lib/bazarr"
+  cp -dpr --no-preserve=ownership "${srcdir}/bazarr" "${pkgdir}/usr/lib/"
+  rm -rf ${pkgdir}/usr/lib/bazarr/.git
+  rm -f ${pkgdir}/usr/lib/bazarr/.gitignore ${pkgdir}/usr/lib/bazarr/.gitattributes
+
+  install -D -m 644 "${srcdir}/bazarr.service" "${pkgdir}/usr/lib/systemd/system/bazarr.service"
+  install -D -m 644 "${srcdir}/bazarr.sysusers" "${pkgdir}/usr/lib/sysusers.d/bazarr.conf"
+  install -D -m 644 "${srcdir}/bazarr.tmpfiles" "${pkgdir}/usr/lib/tmpfiles.d/bazarr.conf"
 }
diff --git a/bazarr.install b/bazarr.install
deleted file mode 100644
index 7053f58b2279..000000000000
--- a/bazarr.install
+++ /dev/null
@@ -1,8 +0,0 @@
-post_install() {
-    systemd-sysusers bazarr.conf
-    chown -R bazarr: /usr/share/bazarr/data
-}
-
-post_upgrade() {
-    post_install $1
-}
diff --git a/bazarr.service b/bazarr.service
index 81d75b9c6cc9..02b08b0267a8 100644
--- a/bazarr.service
+++ b/bazarr.service
@@ -3,11 +3,12 @@ Description=Bazarr Service
 After=network.target
 
 [Service]
-Environment=MONO_TLS_PROVIDER=legacy
 User=bazarr
-ExecStart=/usr/bin/bazarr
+Group=bazarr
 Type=simple
-TimeoutStopSec=20
+ExecStart=/usr/bin/python2 /usr/lib/bazarr/bazarr.py
+Restart=always
+TimeoutStopSec=30
 
 [Install]
 WantedBy=multi-user.target
diff --git a/bazarr.sh b/bazarr.sh
deleted file mode 100755
index 4c4fe4c9b2ca..000000000000
--- a/bazarr.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec python /usr/share/bazarr/bazarr.py "$@"
diff --git a/bazarr.sysusers b/bazarr.sysusers
index 352bafaa839e..26c9a17596c5 100644
--- a/bazarr.sysusers
+++ b/bazarr.sysusers
@@ -1 +1 @@
-u bazarr - "Bazarr daemon" /usr/share/bazarr
+u bazarr - "Bazarr daemon" /usr/lib/bazarr
diff --git a/bazarr.tmpfiles b/bazarr.tmpfiles
new file mode 100644
index 000000000000..f0cca7e571ee
--- /dev/null
+++ b/bazarr.tmpfiles
@@ -0,0 +1,5 @@
+# Override this file with a modified version in /etc/tmpfiles.d/
+d /var/lib/bazarr 0755 bazarr bazarr
+Z /var/lib/bazarr - bazarr bazarr
+Z /usr/lib/bazarr - bazarr bazarr
+L /var/log/bazarr - - - - /usr/lib/bazarr/data/log