upgpkg: xi-core 0.3.0-3

2 files changed, 18 insertions, 13 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 80e46e6a313e..6ff591114f9d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = xi-core
 	pkgdesc = A modern editor with a backend written in Rust
 	pkgver = 0.3.0
-	pkgrel = 2
+	pkgrel = 3
 	url = https://github.com/xi-editor/xi-editor
 	arch = i686
 	arch = x86_64
@@ -14,4 +14,3 @@ pkgbase = xi-core
 	sha256sums = e42998ad9b6d6df0f797afd005f9c1286aad24c30a77d0dd380730c248274b8d
 
 pkgname = xi-core
-
diff --git a/PKGBUILD b/PKGBUILD
index b32d520600f2..621e57f37cb0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,34 +1,40 @@
-# Maintainer: Philip Goto <philip.goto@gmail.com>
+# Maintainer: Caleb Maclennan <caleb@alerque.com>
+# Contributor: Philip Goto <philip.goto@gmail.com>
 
 pkgname=xi-core
+_pkgname=xi-editor
 pkgver=0.3.0
-pkgrel=2
+pkgrel=3
 pkgdesc='A modern editor with a backend written in Rust'
 arch=(i686 x86_64 armv7h aarch64)
-url='https://github.com/xi-editor/xi-editor'
+url="https://github.com/$_pkgname/$_pkgname"
 license=(Apache)
 depends=(gcc-libs)
 makedepends=(cargo)
 source=("$pkgname-$pkgver.tar.gz::$url/archive/v$pkgver.tar.gz")
 sha256sums=('e42998ad9b6d6df0f797afd005f9c1286aad24c30a77d0dd380730c248274b8d')
 
+_dir="$_pkgname-$pkgver/rust"
 
 prepare() {
-  cd "xi-editor-$pkgver/rust"
-  cargo fetch --locked
+	cd "$_dir"
+	cargo fetch --locked --target "$CARCH-unknown-linux-gnu"
 }
 
 build() {
-  cd "xi-editor-$pkgver/rust"
-  cargo build --locked --release --offline --all-features
+	cd "$_dir"
+	export RUSTUP_TOOLCHAIN=stable
+	export CARGO_TARGET_DIR=target
+	cargo build --frozen --release --all-features
 }
 
 check() {
-  cd "xi-editor-$pkgver/rust"
-  cargo test --locked --release --offline
+	cd "$_dir"
+	export RUSTUP_TOOLCHAIN=stable
+	cargo test --frozen --all-features
 }
 
 package() {
-  cd "xi-editor-$pkgver/rust"
-  install -D "target/release/xi-core" -t "$pkgdir/usr/bin"
+	cd "$_dir"
+	install -Dm0755 -t "$pkgdir/usr/bin/" "target/release/$pkgname"
 }