summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD12
2 files changed, 8 insertions, 8 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 04e76fb1a61a..5d06ba4832cf 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
pkgbase = r-jaspmixedmodels
pkgdesc = Mixed Models Module for JASP
pkgver = 0.15.0
- pkgrel = 1
+ pkgrel = 2
url = https://github.com/jasp-stats/jaspMixedModels
- arch = x86_64
+ arch = any
groups = r-jasp
groups = r-jaspcommon
license = GPL
diff --git a/PKGBUILD b/PKGBUILD
index 5cbf2756db8b..dbf9b960017f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,9 +3,9 @@ _pkgname=jaspMixedModels
_pkgver=0.15.0
pkgname=r-${_pkgname,,}
pkgver=0.15.0
-pkgrel=1
+pkgrel=2
pkgdesc="Mixed Models Module for JASP"
-arch=('x86_64')
+arch=('any')
url="https://github.com/jasp-stats/${_pkgname}"
license=('GPL')
depends=(r
@@ -30,13 +30,13 @@ 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"
mkdir -p ${pkgdir}/usr/lib/jasp-desktop/Modules
ln -s /usr/lib/R/library ${pkgdir}/usr/lib/jasp-desktop/Modules/${_pkgname}
}