Compiled and working

- Added the proper packaging structure
- env.conf included; same as ubuntu's
- added jamovi.sh, which modifies LD path to include R and RInside.
- includes patch for fixing a missing R header include path

4 files changed, 72 insertions, 3 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 93453f870b42..64f30be72ab2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 # Generated by mksrcinfo v8
-# Mon Jun  5 02:14:40 UTC 2017
+# Mon Jun  5 03:58:47 UTC 2017
 pkgbase = jamovi-git
 	pkgdesc = Open Source Software to bridge the gap between researcher and statistician
 	pkgver = r481.e08f52f
@@ -16,11 +16,16 @@ pkgbase = jamovi-git
 	depends = python-nanomsg
 	depends = python-yaml
 	depends = boost-libs
+	depends = python-chardet
 	provides = jamovi
 	conflicts = jamovi
 	source = git+https://github.com/jamovi/jamovi.git
+	source = env.conf
+	source = jamovi.sh
 	source = rinclude.patch
 	md5sums = SKIP
+	md5sums = 207b3012a3235d9f9a0ec12fa4027694
+	md5sums = 38fec18885de4ecbb91aef1f201c20d7
 	md5sums = 60a8bd543e49debf6d917afde56f60c3
 
 pkgname = jamovi-git
diff --git a/PKGBUILD b/PKGBUILD
index c23616374417..93bb178f4dd5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -15,13 +15,17 @@ pkgdesc="Open Source Software to bridge the gap between researcher and statistic
 arch=('any')
 url=""
 license=('git')
-depends=('electron' 'python' 'python-protobuf' 'python-tornado' 'python-nanomsg' 'python-yaml' 'boost-libs')
+depends=('electron' 'python' 'python-protobuf' 'python-tornado' 'python-nanomsg' 'python-yaml' 'boost-libs' 'python-chardet')
 makedepends=('boost' 'npm' 'cython') # 'bzr', 'git', 'mercurial' or 'subversion'
 provides=("${pkgname%-git}")
 conflicts=("${pkgname%-git}")
 source=(git+https://github.com/jamovi/jamovi.git 
+	"env.conf" 
+	"jamovi.sh"
 	"rinclude.patch")
 md5sums=('SKIP'
+         '207b3012a3235d9f9a0ec12fa4027694'
+         '38fec18885de4ecbb91aef1f201c20d7'
          '60a8bd543e49debf6d917afde56f60c3')
 
 pkgver() {
@@ -53,5 +57,48 @@ build() {
 package() {
 	cd "$srcdir/${pkgname%-git}"
 	mkdir -p $pkgdir/usr/lib/$_pkgname/bin
-	mkdir -p $pkgdir/usr/lib/$_pkgname/Resources
+	mkdir -p $pkgdir/usr/lib/$_pkgname/Resources/jamovi/{client,examples,server}
+	mkdir -p $pkgdir/usr/lib/$_pkgname/Resources/modules
+
+	# Resources
+	## Client files
+	cp -r client/{analysisui.css,analysisui.html,analysisui.js,index.html,main.css,main.js,package.json,resultsview.css,resultsview.html,resultsview.js,assets} $pkgdir/usr/lib/$_pkgname/Resources/jamovi/client/
+
+	## Examples
+	cp -r examples $pkgdir/usr/lib/$_pkgname/Resources/jamovi/
+
+	## Server
+	mkdir $pkgdir/usr/lib/$_pkgname/Resources/jamovi/server/jamovi
+	cp -r server/jamovi/server $pkgdir/usr/lib/$_pkgname/Resources/jamovi/server/jamovi
+	cp -r server/jamovi/{__init__.py,core.cpython-36m-x86_64-linux-gnu.so} $pkgdir/usr/lib/$_pkgname/Resources/jamovi/server/jamovi
+
+	# User stuff
+	mkdir -p $pkgdir/usr/share/applications/
+	mkdir -p $pkgdir/usr/bin
+	cp platform/jamovi.desktop $pkgdir/usr/share/applications
+	install -m 755 $srcdir/jamovi.sh $pkgdir/usr/lib/$_pkgname/bin/jamovi.sh
+	cp platform/app-icon.svg $pkgdir/usr/lib/$_pkgname/Resources
+	ln -s /usr/lib/$_pkgname/bin/jamovi.sh $pkgdir/usr/bin/jamovi
+
+	# bin
+	## engine
+	cp engine/jamovi-engine $pkgdir/usr/lib/$_pkgname/bin/
+	## Various electron stuff
+	ln -s /usr/lib/electron/* $pkgdir/usr/lib/$_pkgname/bin/
+	#cp -r /usr/lib/electron/* $pkgdir/usr/lib/$_pkgname/bin
+	cp /usr/lib/electron/electron $pkgdir/usr/lib/$_pkgname/bin/jamovi
+	### Remove node link
+	rm $pkgdir/usr/lib/$_pkgname/bin/node
+	#rm -r $pkgdir/usr/lib/$_pkgname/bin/node
+	### Rename electron executable to jamovi
+	#mv $pkgdir/usr/lib/$_pkgname/bin/electron $pkgdir/usr/lib/$_pkgname/bin/jamovi 
+	### Replace electron's default thing with 
+	rm $pkgdir/usr/lib/$_pkgname/bin/resources
+	mkdir $pkgdir/usr/lib/$_pkgname/bin/resources
+	cp electron/default_app.asar $pkgdir/usr/lib/$_pkgname/bin/resources
+	ln -s /usr/lib/electron/resources/electron.asar $pkgdir/usr/lib/$_pkgname/bin/resources
+
+	# Env conf
+	cp $srcdir/env.conf $pkgdir/usr/lib/$_pkgname/bin
+
 }
diff --git a/env.conf b/env.conf
new file mode 100644
index 000000000000..e415576df8a6
--- /dev/null
+++ b/env.conf
@@ -0,0 +1,13 @@
+[ENV]
+
+R_HOME=/usr/lib/R
+R_LIBS=/usr/lib/R/site-library:/usr/lib/R/library
+PYTHONPATH=../Resources/jamovi/server
+
+JAMOVI_HOME=..
+JAMOVI_MODULES_PATH=../Resources/modules
+JAMOVI_EXAMPLES_PATH=../Resources/jamovi/examples
+JAMOVI_CLIENT_PATH=../Resources/jamovi/client
+JAMOVI_SERVER_CMD=/usr/bin/python3 -u -m jamovi.server 0
+
+
diff --git a/jamovi.sh b/jamovi.sh
new file mode 100755
index 000000000000..321740874795
--- /dev/null
+++ b/jamovi.sh
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+export LD_LIBRARY_PATH=/usr/lib/R/library/RInside/lib/:/usr/lib/R/lib/:/usr/lib
+exec /usr/lib/jamovi/bin/jamovi $@