summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Martin2017-06-04 23:18:31 -0500
committerStephen Martin2017-06-04 23:18:31 -0500
commit192a486c47a7f4d4960703fbab686465f68adbc7 (patch)
tree0e5f3a3b53f0499a4d734e7157558a60d4b37a58
parent33e81877d7c42a2c41b8ba377c19fcc532c25044 (diff)
downloadaur-192a486c47a7f4d4960703fbab686465f68adbc7.tar.gz
Cleaned up PKGFILE
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD28
2 files changed, 9 insertions, 21 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 64f30be72ab2..5869322d44cd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
# Generated by mksrcinfo v8
-# Mon Jun 5 03:58:47 UTC 2017
+# Mon Jun 5 04:18:23 UTC 2017
pkgbase = jamovi-git
pkgdesc = Open Source Software to bridge the gap between researcher and statistician
pkgver = r481.e08f52f
diff --git a/PKGBUILD b/PKGBUILD
index 93bb178f4dd5..4373e8550706 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,13 +1,5 @@
-# This is an example PKGBUILD file. Use this as a start to creating your own,
-# and remove these comments. For more information, see 'man PKGBUILD'.
-# NOTE: Please fill out the license field for your package! If it is unknown,
-# then please put 'unknown'.
-
-# The following guidelines are specific to BZR, GIT, HG and SVN packages.
-# Other VCS sources are not natively supported by makepkg yet.
-
-# Maintainer: Your Name <youremail@domain.com>
-pkgname=jamovi-git # '-bzr', '-git', '-hg' or '-svn'
+# Maintainer: Stephen Martin <stephenSRMMartin at gmail dot com>
+pkgname=jamovi-git
_pkgname=jamovi
pkgver=r481.e08f52f
pkgrel=1
@@ -56,9 +48,12 @@ build() {
package() {
cd "$srcdir/${pkgname%-git}"
+ mkdir -p $pkgdir/usr/bin
mkdir -p $pkgdir/usr/lib/$_pkgname/bin
mkdir -p $pkgdir/usr/lib/$_pkgname/Resources/jamovi/{client,examples,server}
+ mkdir -p $pkgdir/usr/lib/$_pkgname/Resources/jamovi/server/jamovi
mkdir -p $pkgdir/usr/lib/$_pkgname/Resources/modules
+ mkdir -p $pkgdir/usr/share/applications/
# Resources
## Client files
@@ -68,16 +63,14 @@ package() {
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
+
+ install -m 755 $srcdir/jamovi.sh $pkgdir/usr/lib/$_pkgname/bin/jamovi.sh
ln -s /usr/lib/$_pkgname/bin/jamovi.sh $pkgdir/usr/bin/jamovi
# bin
@@ -85,14 +78,10 @@ package() {
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
+ ### Replace electron's default thing with jamovi's
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
@@ -100,5 +89,4 @@ package() {
# Env conf
cp $srcdir/env.conf $pkgdir/usr/lib/$_pkgname/bin
-
}