Moved all packages to JASP directory except RInside.

3 files changed, 12 insertions, 205 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5cfb2dc0ee40..f56467e2892d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,214 +1,18 @@
 # Generated by mksrcinfo v8
-# Wed May 18 16:48:18 UTC 2016
+# Thu Sep 22 07:01:43 UTC 2016
 pkgbase = jasp-rbundle
 	pkgdesc = A bundle of R packages needed by JASP desktop
-	pkgver = 2016.05.18
+	pkgver = 2016.09.22
 	pkgrel = 1
 	url = http://cran.r-project.org/
 	arch = any
 	makedepends = r
 	makedepends = gcc-fortran
 	depends = r
-	provides = r-cran-abind
-	provides = r-cran-htmltools
-	provides = r-cran-jsonlite
-	provides = r-cran-yaml
-	provides = r-cran-xtable
-	provides = r-cran-iterators
-	provides = r-cran-arm
-	provides = r-cran-htmlwidgets
-	provides = r-cran-rstudioapi
-	provides = r-cran-rcolorbrewer
-	provides = r-cran-dichromat
-	provides = r-cran-labeling
-	provides = r-cran-pkgmaker
-	provides = r-cran-registry
-	provides = r-cran-rngtools
-	provides = r-cran-gridbase
-	provides = r-cran-foreach
-	provides = r-cran-doparallel
-	provides = r-cran-stringi
-	provides = r-cran-magrittr
-	provides = r-cran-modeltools
-	provides = r-cran-sparsem
-	provides = r-cran-matrixcalc
-	provides = r-cran-mi
-	provides = r-cran-diagrammer
-	provides = r-cran-formula
-	provides = r-cran-proto
-	provides = r-cran-scales
-	provides = r-cran-latticeextra
-	provides = r-cran-acepack
-	provides = r-cran-gtable
-	provides = r-cran-gridextra
-	provides = r-cran-nmf
-	provides = r-cran-irlba
-	provides = r-cran-digest
-	provides = r-cran-rjson
-	provides = r-cran-whisker
-	provides = r-cran-th.data
-	provides = r-cran-sandwich
-	provides = r-cran-zoo
-	provides = r-cran-coda
-	provides = r-cran-pbapply
-	provides = r-cran-mvtnorm
-	provides = r-cran-stringr
-	provides = r-cran-gtools
-	provides = r-cran-matrixmodels
-	provides = r-cran-rcppeigen
-	provides = r-cran-minqa
-	provides = r-cran-nloptr
-	provides = r-cran-reshape2
-	provides = r-cran-coin
-	provides = r-cran-pbkrtest
-	provides = r-cran-quantreg
-	provides = r-cran-colorspace
-	provides = r-cran-psych
-	provides = r-cran-ellipse
-	provides = r-cran-sem
-	provides = r-cran-plyr
-	provides = r-cran-hmisc
-	provides = r-cran-igraph
-	provides = r-cran-jpeg
-	provides = r-cran-png
-	provides = r-cran-sna
-	provides = r-cran-corpcor
-	provides = r-cran-ggplot2
-	provides = r-cran-glasso
-	provides = r-cran-huge
-	provides = r-cran-fdrtool
-	provides = r-cran-d3network
-	provides = r-cran-ggm
-	provides = r-cran-elliptic
-	provides = r-cran-contfrac
-	provides = r-cran-desolve
-	provides = r-cran-mnormt
-	provides = r-cran-pbivnorm
-	provides = r-cran-quadprog
-	provides = r-cran-estimability
-	provides = r-cran-multcomp
-	provides = r-cran-lmtest
-	provides = r-cran-qvcalc
-	provides = r-cran-relimp
-	provides = r-cran-bayesfactor
-	provides = r-cran-lme4
-	provides = r-cran-rcpp
 	provides = r-cran-rinside
-	provides = r-cran-afex
-	provides = r-cran-base64
-	provides = r-cran-car
-	provides = r-cran-effects
-	provides = r-cran-qgraph
-	provides = r-cran-hypergeo
-	provides = r-cran-lavaan
-	provides = r-cran-logspline
-	provides = r-cran-lsmeans
-	provides = r-cran-plotrix
-	provides = r-cran-semtools
-	provides = r-cran-vcd
-	provides = r-cran-vcdextra
-	provides = r-cran-gnm
-	conflicts = r-cran-abind
-	conflicts = r-cran-htmltools
-	conflicts = r-cran-jsonlite
-	conflicts = r-cran-yaml
-	conflicts = r-cran-xtable
-	conflicts = r-cran-iterators
-	conflicts = r-cran-arm
-	conflicts = r-cran-htmlwidgets
-	conflicts = r-cran-rstudioapi
-	conflicts = r-cran-rcolorbrewer
-	conflicts = r-cran-dichromat
-	conflicts = r-cran-labeling
-	conflicts = r-cran-pkgmaker
-	conflicts = r-cran-registry
-	conflicts = r-cran-rngtools
-	conflicts = r-cran-gridbase
-	conflicts = r-cran-foreach
-	conflicts = r-cran-doparallel
-	conflicts = r-cran-stringi
-	conflicts = r-cran-magrittr
-	conflicts = r-cran-modeltools
-	conflicts = r-cran-sparsem
-	conflicts = r-cran-matrixcalc
-	conflicts = r-cran-mi
-	conflicts = r-cran-diagrammer
-	conflicts = r-cran-formula
-	conflicts = r-cran-proto
-	conflicts = r-cran-scales
-	conflicts = r-cran-latticeextra
-	conflicts = r-cran-acepack
-	conflicts = r-cran-gtable
-	conflicts = r-cran-gridextra
-	conflicts = r-cran-nmf
-	conflicts = r-cran-irlba
-	conflicts = r-cran-digest
-	conflicts = r-cran-rjson
-	conflicts = r-cran-whisker
-	conflicts = r-cran-th.data
-	conflicts = r-cran-sandwich
-	conflicts = r-cran-zoo
-	conflicts = r-cran-coda
-	conflicts = r-cran-pbapply
-	conflicts = r-cran-mvtnorm
-	conflicts = r-cran-stringr
-	conflicts = r-cran-gtools
-	conflicts = r-cran-matrixmodels
-	conflicts = r-cran-rcppeigen
-	conflicts = r-cran-minqa
-	conflicts = r-cran-nloptr
-	conflicts = r-cran-reshape2
-	conflicts = r-cran-coin
-	conflicts = r-cran-pbkrtest
-	conflicts = r-cran-quantreg
-	conflicts = r-cran-colorspace
-	conflicts = r-cran-psych
-	conflicts = r-cran-ellipse
-	conflicts = r-cran-sem
-	conflicts = r-cran-plyr
-	conflicts = r-cran-hmisc
-	conflicts = r-cran-igraph
-	conflicts = r-cran-jpeg
-	conflicts = r-cran-png
-	conflicts = r-cran-sna
-	conflicts = r-cran-corpcor
-	conflicts = r-cran-ggplot2
-	conflicts = r-cran-glasso
-	conflicts = r-cran-huge
-	conflicts = r-cran-fdrtool
-	conflicts = r-cran-d3network
-	conflicts = r-cran-ggm
-	conflicts = r-cran-elliptic
-	conflicts = r-cran-contfrac
-	conflicts = r-cran-desolve
-	conflicts = r-cran-mnormt
-	conflicts = r-cran-pbivnorm
-	conflicts = r-cran-quadprog
-	conflicts = r-cran-estimability
-	conflicts = r-cran-multcomp
-	conflicts = r-cran-lmtest
-	conflicts = r-cran-qvcalc
-	conflicts = r-cran-relimp
-	conflicts = r-cran-bayesfactor
-	conflicts = r-cran-lme4
-	conflicts = r-cran-rcpp
 	conflicts = r-cran-rinside
-	conflicts = r-cran-afex
-	conflicts = r-cran-base64
-	conflicts = r-cran-car
-	conflicts = r-cran-effects
-	conflicts = r-cran-qgraph
-	conflicts = r-cran-hypergeo
-	conflicts = r-cran-lavaan
-	conflicts = r-cran-logspline
-	conflicts = r-cran-lsmeans
-	conflicts = r-cran-plotrix
-	conflicts = r-cran-semtools
-	conflicts = r-cran-vcd
-	conflicts = r-cran-vcdextra
-	conflicts = r-cran-gnm
 	source = rbundle.R
-	md5sums = d6e6072fc775909ce44462b2dd18a355
+	md5sums = 3e460035be3f27cd4a059166b1db2785
 
 pkgname = jasp-rbundle
 
diff --git a/PKGBUILD b/PKGBUILD
index 59ed1092234b..f1d4a0456773 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Stephen Martin <stephenSRMMartin at gmail dot com>
 pkgname=jasp-rbundle
-pkgver=2016.05.18
+pkgver=2016.09.22
 pkgrel=1
 pkgdesc="A bundle of R packages needed by JASP desktop"
 url="http://cran.r-project.org/"
@@ -12,21 +12,23 @@ source=("rbundle.R")
 pkgver() {
 	echo $(date +%Y.%m.%d)
 }
-provides=('r-cran-abind' 'r-cran-htmltools' 'r-cran-jsonlite' 'r-cran-yaml' 'r-cran-xtable' 'r-cran-iterators' 'r-cran-arm' 'r-cran-htmlwidgets' 'r-cran-rstudioapi' 'r-cran-rcolorbrewer' 'r-cran-dichromat' 'r-cran-labeling' 'r-cran-pkgmaker' 'r-cran-registry' 'r-cran-rngtools' 'r-cran-gridbase' 'r-cran-foreach' 'r-cran-doparallel' 'r-cran-stringi' 'r-cran-magrittr' 'r-cran-modeltools' 'r-cran-sparsem' 'r-cran-matrixcalc' 'r-cran-mi' 'r-cran-diagrammer' 'r-cran-formula' 'r-cran-proto' 'r-cran-scales' 'r-cran-latticeextra' 'r-cran-acepack' 'r-cran-gtable' 'r-cran-gridextra' 'r-cran-nmf' 'r-cran-irlba' 'r-cran-digest' 'r-cran-rjson' 'r-cran-whisker' 'r-cran-th.data' 'r-cran-sandwich' 'r-cran-zoo' 'r-cran-coda' 'r-cran-pbapply' 'r-cran-mvtnorm' 'r-cran-stringr' 'r-cran-gtools' 'r-cran-matrixmodels' 'r-cran-rcppeigen' 'r-cran-minqa' 'r-cran-nloptr' 'r-cran-reshape2' 'r-cran-coin' 'r-cran-pbkrtest' 'r-cran-quantreg' 'r-cran-colorspace' 'r-cran-psych' 'r-cran-ellipse' 'r-cran-sem' 'r-cran-plyr' 'r-cran-hmisc' 'r-cran-igraph' 'r-cran-jpeg' 'r-cran-png' 'r-cran-sna' 'r-cran-corpcor' 'r-cran-ggplot2' 'r-cran-glasso' 'r-cran-huge' 'r-cran-fdrtool' 'r-cran-d3network' 'r-cran-ggm' 'r-cran-elliptic' 'r-cran-contfrac' 'r-cran-desolve' 'r-cran-mnormt' 'r-cran-pbivnorm' 'r-cran-quadprog' 'r-cran-estimability' 'r-cran-multcomp' 'r-cran-lmtest' 'r-cran-qvcalc' 'r-cran-relimp' 'r-cran-bayesfactor' 'r-cran-lme4' 'r-cran-rcpp' 'r-cran-rinside' 'r-cran-afex' 'r-cran-base64' 'r-cran-car' 'r-cran-effects' 'r-cran-qgraph' 'r-cran-hypergeo' 'r-cran-lavaan' 'r-cran-logspline' 'r-cran-lsmeans' 'r-cran-plotrix' 'r-cran-semtools' 'r-cran-vcd' 'r-cran-vcdextra' 'r-cran-gnm')
-conflicts=('r-cran-abind' 'r-cran-htmltools' 'r-cran-jsonlite' 'r-cran-yaml' 'r-cran-xtable' 'r-cran-iterators' 'r-cran-arm' 'r-cran-htmlwidgets' 'r-cran-rstudioapi' 'r-cran-rcolorbrewer' 'r-cran-dichromat' 'r-cran-labeling' 'r-cran-pkgmaker' 'r-cran-registry' 'r-cran-rngtools' 'r-cran-gridbase' 'r-cran-foreach' 'r-cran-doparallel' 'r-cran-stringi' 'r-cran-magrittr' 'r-cran-modeltools' 'r-cran-sparsem' 'r-cran-matrixcalc' 'r-cran-mi' 'r-cran-diagrammer' 'r-cran-formula' 'r-cran-proto' 'r-cran-scales' 'r-cran-latticeextra' 'r-cran-acepack' 'r-cran-gtable' 'r-cran-gridextra' 'r-cran-nmf' 'r-cran-irlba' 'r-cran-digest' 'r-cran-rjson' 'r-cran-whisker' 'r-cran-th.data' 'r-cran-sandwich' 'r-cran-zoo' 'r-cran-coda' 'r-cran-pbapply' 'r-cran-mvtnorm' 'r-cran-stringr' 'r-cran-gtools' 'r-cran-matrixmodels' 'r-cran-rcppeigen' 'r-cran-minqa' 'r-cran-nloptr' 'r-cran-reshape2' 'r-cran-coin' 'r-cran-pbkrtest' 'r-cran-quantreg' 'r-cran-colorspace' 'r-cran-psych' 'r-cran-ellipse' 'r-cran-sem' 'r-cran-plyr' 'r-cran-hmisc' 'r-cran-igraph' 'r-cran-jpeg' 'r-cran-png' 'r-cran-sna' 'r-cran-corpcor' 'r-cran-ggplot2' 'r-cran-glasso' 'r-cran-huge' 'r-cran-fdrtool' 'r-cran-d3network' 'r-cran-ggm' 'r-cran-elliptic' 'r-cran-contfrac' 'r-cran-desolve' 'r-cran-mnormt' 'r-cran-pbivnorm' 'r-cran-quadprog' 'r-cran-estimability' 'r-cran-multcomp' 'r-cran-lmtest' 'r-cran-qvcalc' 'r-cran-relimp' 'r-cran-bayesfactor' 'r-cran-lme4' 'r-cran-rcpp' 'r-cran-rinside' 'r-cran-afex' 'r-cran-base64' 'r-cran-car' 'r-cran-effects' 'r-cran-qgraph' 'r-cran-hypergeo' 'r-cran-lavaan' 'r-cran-logspline' 'r-cran-lsmeans' 'r-cran-plotrix' 'r-cran-semtools' 'r-cran-vcd' 'r-cran-vcdextra' 'r-cran-gnm')
+provides=('r-cran-rinside')
+conflicts=('r-cran-rinside')
 
 
 prepare(){
-	mkdir -p $srcdir/usr/lib/R/library/
+	mkdir -p $srcdir/usr/share/jasp-desktop/R/library
 }
 
 build(){
 	cd $srcdir
-	_libraryPath=$srcdir/usr/lib/R/library/
+	_libraryPath=$srcdir/usr/share/jasp-desktop/R/library
 	Rscript rbundle.R $_libraryPath
 }
 
 package(){
 	cp -r $srcdir/usr $pkgdir/
+	mkdir -p $pkgdir/usr/lib/R/library
+	mv $pkgdir/usr/share/jasp-desktop/R/library/RInside $pkgdir/usr/lib/R/library/
 }	
-md5sums=('d6e6072fc775909ce44462b2dd18a355')
+md5sums=('3e460035be3f27cd4a059166b1db2785')
diff --git a/rbundle.R b/rbundle.R
index 6039976f0da8..8f08dde009b5 100644
--- a/rbundle.R
+++ b/rbundle.R
@@ -6,6 +6,7 @@ path <- commandArgs(trailingOnly = TRUE)
 print(path)
 
 .libPaths(new = path)
+.Library <- ''
 
 #List of R packages to be installed
 libs <- c('BayesFactor','lme4','Rcpp','RInside','afex','base64','car','effects','qgraph','hypergeo','lavaan',