Update to beta version 3.1.7.2 and siteini from official webgrabplus github.

2 files changed, 43 insertions, 37 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 822edbc372e3..3098935667a3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,19 @@
 pkgbase = wg++
-	pkgdesc = WebGrab+Plus is a free multi-site incremental XMLTV EPG grabber.
-	pkgver = 2.1.0_20190107123114
+	pkgdesc = WebGrab+Plus is a freeware (license via donation) multi-site incremental XMLTV EPG grabber.
+	pkgver = 3.1.7.2_r2393.326fc38
 	pkgrel = 1
 	url = http://webgrabplus.com/
 	arch = any
 	license = custom
+	makedepends = git
+	makedepends = unzip
 	depends = mono
 	provides = wg++
-	source = http://webgrabplus.com/sites/default/files/download/SW/V2.1.0/WebGrabPlus_V2.1_install.tar.gz
-	source = http://webgrabplus.com/sites/default/files/download/ini/SiteIni.Pack_2019.01.07_123114.zip
+	source = http://webgrabplus.com/sites/default/files/download/SW/V3.1.0/WebGrabPlus_V3.1_install.tar.gz
+	source = git+https://github.com/SilentButeo2/webgrabplus-siteinipack.git
 	source = wg++
-	md5sums = 837d35bc377c1dc134c26a044bcee479
-	md5sums = e87c0c64461992d0f3157541a74dfd76
+	md5sums = 1f1ee11bb0c7db9068a6833788079d1b
+	md5sums = SKIP
 	md5sums = 96ddf77a84554bb457dab4fd63e82ae6
 
 pkgname = wg++
-
diff --git a/PKGBUILD b/PKGBUILD
index 41e329a9f201..fc0eb8a2e3a6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,45 +1,50 @@
-# Maintainer: Erikas Rudinskas <erikmnkl@gmail.com>
+# Maintainer: Nikos Toutountzoglou <nikos.toutou@gmail.com>
 
 pkgname=wg++
-pkgver=2.1.0_20190107123114
-_pkgver=2019.01.07_123114
+pkgver=3.1.7.2_r2393.326fc38
+_pkgver=3.1.7.2
 pkgrel=1
-pkgdesc='WebGrab+Plus is a free multi-site incremental XMLTV EPG grabber.'
+pkgdesc='WebGrab+Plus is a freeware (license via donation) multi-site incremental XMLTV EPG grabber.'
 arch=('any')
 url='http://webgrabplus.com/'
 license=('custom')
 depends=('mono')
+makedepends=('git' 'unzip')
 provides=('wg++')
-source=("http://webgrabplus.com/sites/default/files/download/SW/V2.1.0/WebGrabPlus_V2.1_install.tar.gz"
-	"http://webgrabplus.com/sites/default/files/download/ini/SiteIni.Pack_$_pkgver.zip"
-        "wg++")  
-md5sums=("837d35bc377c1dc134c26a044bcee479"
-	 "e87c0c64461992d0f3157541a74dfd76"
-	 "96ddf77a84554bb457dab4fd63e82ae6")
+source=("http://webgrabplus.com/sites/default/files/download/SW/V3.1.0/WebGrabPlus_V3.1_install.tar.gz"
+        "git+https://github.com/SilentButeo2/webgrabplus-siteinipack.git"
+        "wg++")
+
+md5sums=('1f1ee11bb0c7db9068a6833788079d1b'
+         'SKIP'
+         '96ddf77a84554bb457dab4fd63e82ae6')
+
+pkgver() {
+  cd "webgrabplus-siteinipack"
+  printf "${_pkgver}_r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+}
 
 package() {
-	# Install application files:
+	# Install application files
 	mkdir -p "${pkgdir}/opt/wg++"
+  unzip -oq "${srcdir}/webgrabplus-siteinipack/evaluation-builds/V${_pkgver}.zip" -d "${srcdir}/.wg++/bin"
 	cp -R "${srcdir}/.wg++/bin" "${pkgdir}/opt/wg++/"
 	cp -R "${srcdir}/.wg++/doc" "${pkgdir}/opt/wg++/"
-
-	cp -R "${srcdir}/siteini.pack" "${pkgdir}/opt/wg++/"
-
-	# Install configuration files:
-	mkdir -p "${pkgdir}/usr/share/wg++"
-
-	ln -s "/opt/wg++/siteini.pack" "${pkgdir}/usr/share/wg++/siteini.pack"
-
-	cp -R "${srcdir}/.wg++/mdb" "${pkgdir}/usr/share/wg++/"
-	mv "${pkgdir}/usr/share/wg++/mdb/mdb.config.example.xml" "${pkgdir}/usr/share/wg++/mdb/mdb.config.xml"
-
-	cp -R "${srcdir}/.wg++/rex" "${pkgdir}/usr/share/wg++/"
-	mv "${pkgdir}/usr/share/wg++/rex/rex.config.example.xml" "${pkgdir}/usr/share/wg++/rex/rex.config.xml"
-
-	cp -R "${srcdir}/.wg++/siteini.user" "${pkgdir}/usr/share/wg++/"
-
-	cp -R "${srcdir}/.wg++/WebGrab++.config.example.xml" "${pkgdir}/usr/share/wg++/WebGrab++.config.xml"
-
-	# Executable:
+  cp -R "${srcdir}/webgrabplus-siteinipack/siteini.pack" "${pkgdir}/opt/wg++/"
+
+	# Install configuration files
+  mkdir -p "${pkgdir}/usr/share/wg++"
+  cp -R "${srcdir}/webgrabplus-siteinipack/siteini.pack" "${pkgdir}/usr/share/wg++/siteini.pack"	
+  cp -R "${srcdir}/.wg++/mdb" "${pkgdir}/usr/share/wg++/"
+  sed -e "s/\r//g" "${pkgdir}/usr/share/wg++/mdb/mdb.config.example.xml" > "${pkgdir}/usr/share/wg++/mdb/mdb.config.xml"
+  cp -R "${srcdir}/.wg++/rex" "${pkgdir}/usr/share/wg++/"
+  sed -e "s/\r//g" "${pkgdir}/usr/share/wg++/rex/rex.config.example.xml" > "${pkgdir}/usr/share/wg++/rex/rex.config.xml"
+  cp -R "${srcdir}/.wg++/siteini.user" "${pkgdir}/usr/share/wg++/"
+  sed -e "s/\r//g" "${srcdir}/.wg++/WebGrab++.config.example.xml" > "${pkgdir}/usr/share/wg++/WebGrab++.config.example.xml"
+
+  # Cleanup files before build
+  rm -f "${pkgdir}/usr/share/wg++/mdb/mdb.config.example.xml" "${pkgdir}/usr/share/wg++/rex/rex.config.example.xml" 
+
+	# Executable
 	install -Dm755 "${srcdir}/wg++" "${pkgdir}/usr/bin/wg++"
 }