Lock cargo, add tests, quote pkgdir

2 files changed, 24 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7fd7af258dd9..a94fa75954b5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,11 +1,11 @@
 # Generated by mksrcinfo v8
-# Wed Jun  6 14:47:11 UTC 2018
+# Thu Jul 26 05:00:19 UTC 2018
 pkgbase = alacritty-scrollback-git
-	pkgver = 0.1.0+848+g4631ca4
+	pkgver = 0.1.0+853+gf50ca1a
 	pkgrel = 1
 	url = https://github.com/jwilm/alacritty
-	arch = x86_64
 	arch = i686
+	arch = x86_64
 	license = Apache
 	makedepends = git
 	makedepends = rust
diff --git a/PKGBUILD b/PKGBUILD
index 655d9c224672..61848074a3ca 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,13 +1,13 @@
 # Maintainer: Jean Lucas <jean@4ray.co>
 
 pkgname=(alacritty-scrollback-git alacritty-scrollback-terminfo-git)
-pkgver=0.1.0+848+g4631ca4
+pkgver=0.1.0+853+gf50ca1a
 pkgrel=1
-arch=(x86_64 i686)
+arch=(i686 x86_64)
 url=https://github.com/jwilm/alacritty
 license=(Apache)
 makedepends=(git rust cargo cmake fontconfig freetype2 ncurses)
-source=(git+https://github.com/jwilm/alacritty#branch=scrollback)
+source=(git+$url#branch=scrollback)
 sha512sums=(SKIP)
 
 pkgver() {
@@ -15,21 +15,28 @@ pkgver() {
   echo "$(grep '^version =' Cargo.toml | head -n1 | cut -d\" -f2)+$(git rev-list --count HEAD)+g$(git describe --always)"
 }
 
+build() {
+  cd alacritty
+  env CARGO_INCREMENTAL=0 cargo build --locked --release
+}
+
+check() {
+  cd alacritty
+  cargo test --locked --release
+}
+
 package_alacritty-scrollback-git() {
   pkgdesc='A cross-platform, GPU-accelerated terminal emulator (scrollback branch)'
   depends=(freetype2 fontconfig xclip)
   provides=(alacritty)
   conflicts=(alacritty)
 
-  cd alacritty
-  env CARGO_INCREMENTAL=0 cargo build --release
-
-  install -Dm 755 $srcdir/alacritty/target/release/alacritty $pkgdir/usr/bin/alacritty
-  install -Dm 644 $srcdir/alacritty/alacritty.desktop $pkgdir/usr/share/applications/alacritty.desktop
-  install -Dm 644 $srcdir/alacritty/alacritty.man $pkgdir/usr/share/man/man1/alacritty.1 || true
-  install -Dm 644 $srcdir/alacritty/alacritty-completions.bash $pkgdir/usr/share/bash-completion/completions/alacritty || true
-  install -Dm 644 $srcdir/alacritty/alacritty-completions.zsh $pkgdir/usr/share/zsh/site-functions/_alacritty || true
-  install -Dm 644 $srcdir/alacritty/alacritty-completions.fish $pkgdir/usr/share/fish/completions/alacritty.fish || true
+  install -D alacritty/target/release/alacritty "$pkgdir"/usr/bin/alacritty
+  install -Dm 644 alacritty/alacritty.desktop "$pkgdir"/usr/share/applications/alacritty.desktop
+  install -Dm 644 alacritty/alacritty.man "$pkgdir"/usr/share/man/man1/alacritty.1 || true
+  install -Dm 644 alacritty/alacritty-completions.bash "$pkgdir"/usr/share/bash-completion/completions/alacritty || true
+  install -Dm 644 alacritty/alacritty-completions.zsh "$pkgdir"/usr/share/zsh/site-functions/_alacritty || true
+  install -Dm 644 alacritty/alacritty-completions.fish "$pkgdir"/usr/share/fish/completions/alacritty.fish || true
 }
 
 package_alacritty-scrollback-terminfo-git() {
@@ -38,6 +45,6 @@ package_alacritty-scrollback-terminfo-git() {
   conflicts=(alacritty-terminfo)
 
   cd alacritty
-  install -dm 755 $pkgdir/usr/share/terminfo/a
-  tic -o $pkgdir/usr/share/terminfo alacritty.info
+  install -d "$pkgdir"/usr/share/terminfo/a
+  tic -o "$pkgdir"/usr/share/terminfo alacritty.info
 }