[lilac] updated to 1.5.1-4

2 files changed, 11 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 33eac0dd7d47..fdabc873e3e4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 pkgbase = r-jasptools
 	pkgdesc = Helps preview and debug JASP analyses
 	pkgver = 1.5.1
-	pkgrel = 1
+	pkgrel = 4
 	url = https://github.com/jasp-stats/jaspTools
-	arch = x86_64
+	arch = any
 	groups = r-jasp
 	groups = jaspbase
 	license = GPL
diff --git a/PKGBUILD b/PKGBUILD
index 285c3a64a3a6..1010623021ed 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,9 +3,9 @@ _pkgname=jaspTools
 _pkgver=1.5.1
 pkgname=r-${_pkgname,,}
 pkgver=1.5.1
-pkgrel=1
+pkgrel=4
 pkgdesc="Helps preview and debug JASP analyses"
-arch=('x86_64')
+arch=('any')
 url="https://github.com/jasp-stats/${_pkgname}"
 license=('GPL')
 depends=(r
@@ -31,12 +31,14 @@ sha256sums=('SKIP')
 
 
 build() {
-  mkdir -p ${srcdir}/usr/lib/R/library
-  R -e "install.packages('${srcdir}/${_pkgname}',\
-     type='source', repos=NULL,lib='${srcdir}/usr/lib/R/library', INSTALL_opts='--no-multiarch --no-docs --no-test-load')"
+  tar -cvf ${srcdir}/${_pkgname}_${_pkgver}.tar.gz ${_pkgname}
+  R CMD INSTALL ${_pkgname}_${_pkgver}.tar.gz -l "${srcdir}"
 }
 
 package() {
-
-  cp -a --no-preserve=ownership "${srcdir}/usr" "${pkgdir}"
+  install -dm0755 "${pkgdir}/usr/lib/R/library"
+  cp -a --no-preserve=ownership "${_pkgname}" "${pkgdir}/usr/lib/R/library"
+  # we may or may not need this link.
+  mkdir -p  ${pkgdir}/usr/lib/jasp-desktop/Modules
+  ln -s /usr/lib/R/library ${pkgdir}/usr/lib/jasp-desktop/Modules/${_pkgname}
 }