Add new depends and use --config option.

5 files changed, 26 insertions, 13 deletions

diff --git a/.SRCINFO b/.SRCINFO
index eb9728fe01bd..f35fd9c2ec2e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = bazarr-git
 	pkgdesc = Manage and download subtitles for Sonarr and Radarr.
-	pkgver = r564.22d85d7
+	pkgver = r858.35daaeb
 	pkgrel = 1
 	url = https://github.com/morpheus65535/bazarr
 	arch = any
@@ -25,16 +25,19 @@ pkgbase = bazarr-git
 	depends = python2-urllib3
 	depends = python2-waitress
 	depends = python2-webtest
+	depends = python2-gevent
 	provides = bazarr
 	conflicts = bazarr
 	source = git+https://github.com/morpheus65535/bazarr
 	source = bazarr.service
 	source = bazarr.sysusers
 	source = bazarr.tmpfiles
+	source = bazarr.install
 	sha256sums = SKIP
-	sha256sums = e3c57f1a1d9ddd87d097efe2df5148f10de79c445fe6eee158f64b4335f3e174
+	sha256sums = b9e739e66eeabe5e9768db791d0d930e7f3cbaba6d2253a5973f8034ca12a8e7
 	sha256sums = 92fd48cbd7e5fe3a0388bbe756a52098fc461ef2dc87d9e886452e4f15acdcdc
-	sha256sums = 7f75f2c2634524e90b1dea7649fceceb57949efa9db365cfa9e29e58690def4e
+	sha256sums = 3aa2ebbf4083301d331f36486edcb81fcd094767a0ea404a89d870217d4f6632
+	sha256sums = 573beeac951d427e980332ce4d8645ae2299082e6c9c04f96e2a41a98c3acc60
 
 pkgname = bazarr-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 8bc82d30c244..a46c8afcde7d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,7 @@
 # Maintainer: Pieter Goetschalckx <3.14.e.ter <at> gmail <dot> com>
 
-_pkgname=bazarr
-pkgname=$_pkgname-git
-pkgver=r564.22d85d7
+pkgname=bazarr-git
+pkgver=r858.35daaeb
 pkgrel=1
 pkgdesc="Manage and download subtitles for Sonarr and Radarr."
 arch=('any')
@@ -26,7 +25,8 @@ depends=('python2'
          'python2-tzlocal'
          'python2-urllib3'
          'python2-waitress'
-         'python2-webtest')
+         'python2-webtest'
+         'python2-gevent')
 
 makedepends=('git')
 provides=('bazarr')
@@ -34,15 +34,17 @@ conflicts=('bazarr')
 source=('git+https://github.com/morpheus65535/bazarr'
         'bazarr.service'
         'bazarr.sysusers'
-        'bazarr.tmpfiles')
+        'bazarr.tmpfiles'
+        'bazarr.install')
 
 sha256sums=('SKIP'
-            'e3c57f1a1d9ddd87d097efe2df5148f10de79c445fe6eee158f64b4335f3e174'
+            'b9e739e66eeabe5e9768db791d0d930e7f3cbaba6d2253a5973f8034ca12a8e7'
             '92fd48cbd7e5fe3a0388bbe756a52098fc461ef2dc87d9e886452e4f15acdcdc'
-            '7f75f2c2634524e90b1dea7649fceceb57949efa9db365cfa9e29e58690def4e')
+            '3aa2ebbf4083301d331f36486edcb81fcd094767a0ea404a89d870217d4f6632'
+            '573beeac951d427e980332ce4d8645ae2299082e6c9c04f96e2a41a98c3acc60')
 
 pkgver() {
-  cd "$_pkgname"
+  cd "bazarr"
   printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
 
diff --git a/bazarr.install b/bazarr.install
new file mode 100644
index 000000000000..47c4b157fa19
--- /dev/null
+++ b/bazarr.install
@@ -0,0 +1,6 @@
+post_upgrade() {
+  if [[ -d /usr/lib/bazarr/data ]] && [[ ! -d /var/lib/bazarr/config ]]; then
+    echo "Moving old /usr/lib/bazarr/data/* to new /var/lib/bazarr..."
+    mv /usr/lib/bazarr/data/* /var/lib/bazarr/ && rmdir /usr/lib/bazarr/data
+  fi
+}
diff --git a/bazarr.service b/bazarr.service
index 02b08b0267a8..9ab0b2ba483d 100644
--- a/bazarr.service
+++ b/bazarr.service
@@ -6,7 +6,7 @@ After=network.target
 User=bazarr
 Group=bazarr
 Type=simple
-ExecStart=/usr/bin/python2 /usr/lib/bazarr/bazarr.py
+ExecStart=/usr/bin/python2 /usr/lib/bazarr/bazarr.py --no-update --config /var/lib/bazarr
 Restart=always
 TimeoutStopSec=30
 
diff --git a/bazarr.tmpfiles b/bazarr.tmpfiles
index 8646ca635c51..5fd4b21378a8 100644
--- a/bazarr.tmpfiles
+++ b/bazarr.tmpfiles
@@ -1,3 +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
+L /var/log/bazarr - - - - /var/lib/bazarr/log