Rework to use plex-ass-scanner-git

2 files changed, 17 insertions, 22 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b2a8d0ddcc03..7c3330e4ab47 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
-pkgbase = plex-hama-bundle-git
+pkgbase = plex-hama-git
 	pkgdesc = Plex HTTP Anidb Metadata Agent (HAMA)
-	pkgver = r883.6ab37e2
+	pkgver = r1072.bb684a2
 	pkgrel = 1
 	url = https://github.com/ZeroQI/Hama.bundle
 	arch = x86_64
@@ -8,10 +8,10 @@ pkgbase = plex-hama-bundle-git
 	license = GPL3
 	makedepends = git
 	depends = plex-media-server
-	source = plex-hama-bundle-git::git+https://github.com/ZeroQI/Hama.bundle
-	source = https://raw.githubusercontent.com/ZeroQI/Absolute-Series-Scanner/master/Scanners/Series/Absolute%20Series%20Scanner.py
+	depends = plex-ass-scanner-git
+	provides = plex-hama-bundle-git
+	conflicts = plex-hama-bundle-git
+	source = plex-hama-git::git+https://github.com/ZeroQI/Hama.bundle
 	sha512sums = SKIP
-	sha512sums = SKIP
-
-pkgname = plex-hama-bundle-git
 
+pkgname = plex-hama-git
diff --git a/PKGBUILD b/PKGBUILD
index ef18df3c91af..149d68eebf5c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,28 +1,27 @@
+# Maintainer: Ricardo Constantino <ricardo@tsu.re>
 # Maintainer: Frantic1048 <archer@frantic1048.com>
 pkgdesc='Plex HTTP Anidb Metadata Agent (HAMA)'
-pkgname='plex-hama-bundle-git'
-pkgver=r883.6ab37e2
+pkgname=plex-hama-git
+pkgver=r1072.bb684a2
 pkgrel=1
 makedepends=('git')
-depends=('plex-media-server')
-conflicts=()
-provides=()
+depends=('plex-media-server' plex-ass-scanner-git)
+conflicts=('plex-hama-bundle-git')
+provides=('plex-hama-bundle-git')
 arch=('x86_64' 'i686')
 url='https://github.com/ZeroQI/Hama.bundle'
 license=('GPL3')
 source=(
 "${pkgname}::git+${url}"
-"https://raw.githubusercontent.com/ZeroQI/Absolute-Series-Scanner/master/Scanners/Series/Absolute%20Series%20Scanner.py"
 )
-sha512sums=('SKIP'
-            'SKIP')
+sha512sums=('SKIP')
 
 pkgver () {
-	cd "${pkgname}"
+	cd "${srcdir}"
 	(
 		set -o pipefail
-		git describe --long 2>/dev/null | sed 's/\([^-]*-g\)/r\1/;s/-/./g' ||
-		printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+        cd $pkgname
+		printf "r%s.%s" $(git rev-list --count HEAD) $(git rev-parse --short HEAD)
 	)
 }
 
@@ -39,8 +38,4 @@ package () {
 	plugins_dir="${plex_main_folder}/Plug-ins/hama.bundle"
 	install -d "$plugins_dir"
 	cp -r ./$pkgname/* "$plugins_dir"
-
-	scanners_dir="${plex_main_folder}/Scanners/Series"
-	install -d "$scanners_dir"
-	cp "Absolute%20Series%20Scanner.py" "$scanners_dir"/"Absolute Series Scanner.py"
 }