* update pkgver()

* update depends (python-webrtcvad-wheels → python-webrtcvad)
* guard variables with quotes
* modify formatting

3 files changed, 37 insertions, 35 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 94fff126768c..183453ee844a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,20 @@
 pkgbase = bazarr-git
-	pkgdesc = Manage and download subtitles for Sonarr and Radarr.
-	pkgver = r4146.77f3ff82
+	pkgdesc = Manage and download subtitles for Sonarr and Radarr
+	pkgver = 1.2.4.r39.g07697fa21
 	pkgrel = 1
 	url = https://github.com/morpheus65535/bazarr
 	arch = any
 	license = GPL3
 	makedepends = git
-	depends = sqlite
+	depends = ffmpeg
 	depends = python
 	depends = python-gevent
 	depends = python-gevent-websocket
 	depends = python-lxml
 	depends = python-numpy
 	depends = python-pillow
-	depends = python-webrtcvad-wheels
-	depends = ffmpeg
+	depends = python-webrtcvad
+	depends = sqlite
 	depends = unrar
 	provides = bazarr
 	conflicts = bazarr
diff --git a/.gitignore b/.gitignore
index 55a3414c90b2..018a3de08144 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,4 @@
-/*.rpm
-/*.spk
-/*.xz
-/src/
-/pkg/
-/bazarr/
+*
+!PKGBUILD
+!.SRCINFO
+!.gitignore
diff --git a/PKGBUILD b/PKGBUILD
index 80aa3bcad418..e7104d16a12b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,53 +2,57 @@
 # Maintainer: Donald Webster <fryfrog@gmail.com>
 
 pkgname=bazarr-git
-pkgver=r4146.77f3ff82
+pkgver=1.2.4.r39.g07697fa21
 pkgrel=1
-pkgdesc="Manage and download subtitles for Sonarr and Radarr."
+pkgdesc="Manage and download subtitles for Sonarr and Radarr"
 arch=('any')
 url="https://github.com/morpheus65535/bazarr"
 license=('GPL3')
 depends=(
-  'sqlite'
+  'ffmpeg'
   'python'
   'python-gevent'
   'python-gevent-websocket'
   'python-lxml'
   'python-numpy'
   'python-pillow'
-  'python-webrtcvad-wheels'
-  'ffmpeg'
+  'python-webrtcvad'
+  'sqlite'
   'unrar'
 )
 makedepends=('git')
 provides=('bazarr')
 conflicts=('bazarr')
 options=('!strip')
-source=('git+https://github.com/morpheus65535/bazarr'
-        'bazarr.service'
-        'bazarr.sysusers'
-        'bazarr.tmpfiles'
-        'bazarr.install')
+source=(
+  'git+https://github.com/morpheus65535/bazarr'
+  'bazarr.service'
+  'bazarr.sysusers'
+  'bazarr.tmpfiles'
+  'bazarr.install'
+)
 
-sha256sums=('SKIP'
-            'fe83f24cdd17b37f19108d93f30b552bc5edbcc23a22f01e9be963f26d7d61d8'
-            '92fd48cbd7e5fe3a0388bbe756a52098fc461ef2dc87d9e886452e4f15acdcdc'
-            '3aa2ebbf4083301d331f36486edcb81fcd094767a0ea404a89d870217d4f6632'
-            '573beeac951d427e980332ce4d8645ae2299082e6c9c04f96e2a41a98c3acc60')
+sha256sums=(
+  'SKIP'
+  'fe83f24cdd17b37f19108d93f30b552bc5edbcc23a22f01e9be963f26d7d61d8'
+  '92fd48cbd7e5fe3a0388bbe756a52098fc461ef2dc87d9e886452e4f15acdcdc'
+  '3aa2ebbf4083301d331f36486edcb81fcd094767a0ea404a89d870217d4f6632'
+  '573beeac951d427e980332ce4d8645ae2299082e6c9c04f96e2a41a98c3acc60'
+)
 
 pkgver() {
   cd "bazarr"
-  printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+  git describe --long --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
 package() {
-  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
-  find ${pkgdir}/usr/lib/bazarr/ -name '*.gitignore' -delete
-  find ${pkgdir}/usr/lib/bazarr/ -name '*.gitattributes' -delete
+  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"
+  find "$pkgdir/usr/lib/bazarr/" -name '*.gitignore' -delete
+  find "$pkgdir/usr/lib/bazarr/" -name '*.gitattributes' -delete
 
-  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"
+  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"
 }