fix build and check, and better pkgver

1 files changed, 5 insertions, 5 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 2f4e5231b7b0..dfe1f9014271 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Benoît Zugmeyer <bzugmeyer@gmail.com>
 pkgname=deno-git
-pkgver=r470.0208305
+pkgver=0.5.0.r19.g72197878
 pkgrel=1
 pkgdesc="A secure TypeScript runtime on V8"
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ md5sums=(SKIP)
 
 pkgver() {
   cd "$pkgname"
-  printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+  git describe --long --tags 2>/dev/null | sed 's/[^[:digit:]]*\(.\+\)-\([[:digit:]]\+\)-g\([[:xdigit:]]\{7\}\)/\1.r\2.g\3/;t;q1'
 }
 
 prepare() {
@@ -28,16 +28,16 @@ prepare() {
 build() {
   cd "$pkgname"
   export PATH="${srcdir}/python2-path:${PATH}"
-  DENO_BUILD_MODE=release ./tools/build.py :deno
+  DENO_BUILD_MODE=release ./tools/build.py deno
 }
 
 check() {
   cd "$pkgname"
-  ./out/release/deno tests/002_hello.ts
+  ./target/release/deno run tests/002_hello.ts
 }
 
 package() {
   cd "$pkgname"
   install -dm755 "${pkgdir}"/usr/bin
-  install -m755 out/release/deno "${pkgdir}"/usr/bin
+  install -m755 target/release/deno "${pkgdir}"/usr/bin
 }