Clean up PKGBUILD and fix check()

Note that the tests are still failing (upstream issue), but at least now
it won't prompt you when it does fail.

2 files changed, 22 insertions, 29 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c64643bf3635..2160e05673f9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = idris2-git
 	pkgdesc = A purely functional programming language with first class types
 	pkgver = latest
-	pkgrel = 1
+	pkgrel = 2
 	url = https://www.idris-lang.org/
 	arch = x86_64
 	license = custom
diff --git a/PKGBUILD b/PKGBUILD
index 4f0f35eea2bb..7bc92c0110ae 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 _pkgname=idris2
 pkgname=$_pkgname-git
 pkgver=latest
-pkgrel=1
+pkgrel=2
 pkgdesc='A purely functional programming language with first class types'
 url='https://www.idris-lang.org/'
 license=('custom')
@@ -21,60 +21,53 @@ source=("$_pkgname::git+https://github.com/idris-lang/${_pkgname^}.git")
 sha256sums=('SKIP')
 options=(staticlibs)
 
+_setvars() {
+	export MAKEFLAGS+=' -j1 '
+	export SCHEME='chez'
+	_bootstrap="$srcdir/bootstrap"
+	export PATH="$_bootstrap/bin:$PATH"
+}
+
 pkgver() {
 	cd "$srcdir/$_pkgname"
 	git describe --long --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
+prepare() {
+	_setvars
+	mkdir -p "$_bootstrap"
+}
+
 build() {
+	_setvars
 	cd "$srcdir/$_pkgname"
 
-	export MAKEFLAGS+=' -j1 '
-	export SCHEME='chez'
-
-	BOOTSTRAP="$srcdir/bootstrap"
-	export PATH="$BOOTSTRAP/bin:$PATH"
-	export LD_LIBRARY_PATH="$BOOSTRAP/lib:$LD_LIBRARY_PATH"
-	export PREFIX="$BOOTSTRAP"
-
-	mkdir -p "$BOOTSTRAP"
+	export PREFIX="$_bootstrap"
 	make bootstrap
 	make install
 
 	make clean
-	PREFIX="/usr/lib" make all
+	PREFIX='/usr/lib' make all
 }
 
 check() {
+	_setvars
 	cd "$srcdir/$_pkgname"
 
-	export MAKEFLAGS+=' -j1 '
-	export SCHEME='chez'
-
-	BOOTSTRAP="$srcdir/bootstrap"
-	PATH="$BOOTSTRAP/bin:$PATH"
-	LD_LIBRARY_PATH="$BOOSTRAP/lib:$PATH"
-	export PREFIX="$BOOTSTRAP"
-	export IDRIS2_PREFIX="$PREFIX"
+	export PREFIX="$_bootstrap"
 
-	make install
-	make test
+	INTERACTIVE='' make test
 }
 
 package() {
+	_setvars
 	options=(staticlibs)
 	cd "$srcdir/$_pkgname"
 
-	export MAKEFLAGS+=' -j1 '
-	export SCHEME='chez'
-
-	BOOTSTRAP="$srcdir/bootstrap"
-	PATH="/usr/lib/bin:$PREFIX/bin:$BOOTSTRAP/bin:$PATH"
-	LD_LIBRARY_PATH="/usr/lib/lib:$PREFIX/lib:$BOOSTRAP/lib:$LD_LIBRARY_PATH"
 	export PREFIX="$pkgdir/usr/lib"
 	export IDRIS2_PREFIX="$PREFIX"
 
-	PREFIX="/usr/lib" IDRIS2_PREFIX="$PREFIX" make src/IdrisPaths.idr
+	PREFIX='/usr/lib' IDRIS2_PREFIX='/usr/lib' make src/IdrisPaths.idr
 	sed -i 's|src/IdrisPaths.idr: FORCE|src/IdrisPaths.idr:|g' Makefile
 
 	make install