update

2 files changed, 29 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7e129389d8f8..1a15ab55ab9e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = dict-ecdict-git
 	pkgdesc = A port of Ultimate ECDICT database for dictd et al.
-	pkgver = 1.0.0.r6.6594129
+	pkgver = 1.0.0.r7.7404d50
 	pkgrel = 1
 	url = https://github.com/skywind3000/ECDICT-ultimate
 	install = dict-ecdict-git.install
@@ -14,7 +14,10 @@ pkgbase = dict-ecdict-git
 	optdepends = dictd: dict client and server
 	provides = dict-ecdict
 	conflicts = dict-ecdict
+	noextract = ecdict-ultimate-csv.zip
+	source = ecdict-ultimate-csv.zip::https://github.com/skywind3000/ECDICT-ultimate/releases/download/1.0.0/ecdict-ultimate-csv.zip
 	source = git+https://github.com/tuberry/dict-ecdict
+	sha512sums = c9353d793c28ee22a40924ed1deb98327ca12c270be0b2bc94de1d66cd582d2bf8f13eb835a787f7ecf144b9a69813024edd5385d2d6e9b4adfeaa79926c95cc
 	sha512sums = SKIP
 
 pkgname = dict-ecdict-git
diff --git a/PKGBUILD b/PKGBUILD
index 4e69ab26d920..b009f425e1c4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,43 +1,48 @@
 # Maintainer: tuberry
 
-_upstream='skywind3000/ECDICT-ultimate'
+_version=1.0.0
 _srcname=dict-ecdict
+_csvname=ultimate.csv
+_zipname=ecdict-ultimate-csv.zip
 pkgname=dict-ecdict-git
-pkgver=1.0.0.r6.6594129
+pkgver=1.0.0.r7.7404d50
 pkgrel=1
 pkgdesc="A port of Ultimate ECDICT database for dictd et al."
 arch=('any')
-url="https://github.com/${_upstream}"
+url="https://github.com/skywind3000/ECDICT-ultimate"
 license=('MIT')
 optdepends=('dictd: dict client and server')
 makedepends=('dictd' 'git' 'curl' 'python' 'unzip')
 provides=('dict-ecdict')
 conflicts=('dict-ecdict')
 install=${pkgname}.install
-source=("git+https://github.com/tuberry/${_srcname}")
-sha512sums=('SKIP')
-
-_get_latest_release()
-{ # from -- https://gist.github.com/lukechilds/a83e1d7127b78fef38c2914c4ececc3c
-  curl --silent "https://api.github.com/repos/$1/releases/latest" |
-    grep '"tag_name":' |
-    sed -E 's/.*"([^"]+)".*/\1/'
-}
+source=("${_zipname}::${url}/releases/download/${_version}/${_zipname}"
+        "git+https://github.com/tuberry/${_srcname}")
+noextract=("${_zipname}")
+sha512sums=("c9353d793c28ee22a40924ed1deb98327ca12c270be0b2bc94de1d66cd582d2bf8f13eb835a787f7ecf144b9a69813024edd5385d2d6e9b4adfeaa79926c95cc"
+            "SKIP")
 
 pkgver()
 {
     cd ${_srcname}
-    printf "%s.r%s.%s" \
-        "$( _get_latest_release ${_upstream} )" \
-        "$( git rev-list --count HEAD )" \
-        "$( git rev-parse --short HEAD )"
+    printf "%s.r%s.%s" "${_version}" "$( git rev-list --count HEAD )" "$( git rev-parse --short HEAD )"
 }
 
+prepare()
+{
+  cd ${_srcname}
+  ln -sf ${srcdir}/${_zipname} ${_zipname}
+}
 
-package()
+build()
 {
-    cd ${_srcname}
-    make VERSION=$( _get_latest_release ${_upstream} ) DESTDIR=${pkgdir} install
+  cd ${_srcname}
+  make
+}
 
-    install -Dm644 LICENSE ${pkgdir}/usr/share/licenses/${_srcname}/LICENSE
+package()
+{
+  cd ${_srcname}
+  make DESTDIR=${pkgdir} install
+  install -Dm644 LICENSE ${pkgdir}/usr/share/licenses/${_srcname}/LICENSE
 }