Installing in /opt/shashlik-bin instead of /opt/shashlik

3 files changed, 41 insertions, 23 deletions

diff --git a/.SRCINFO b/.SRCINFO
index adb282b21ad2..689ceef675d7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,16 @@
-# Generated by mksrcinfo v8
-# Sat Dec 17 14:30:22 UTC 2016
 pkgbase = shashlik-bin
-	pkgdesc = run Android applications on a standard Linux desktop
+	pkgdesc = A way to run Android applications on a standard Linux desktop as easily and simply as possible
 	pkgver = 0.9.3
-	pkgrel = 2
+	pkgrel = 3
 	url = http://www.shashlik.io
 	arch = x86_64
 	license = GPL
-	depends = python
 	depends = lib32-libgl
-	depends = kdialog
+	optdepends = kdialog
+	optdepends = python
 	provides = shashlik
 	conflicts = shashlik
-	source = http://static.davidedmundson.co.uk/shashlik/shashlik_0.9.3.deb
+	source = shashlik-bin-0.9.3.deb::http://static.davidedmundson.co.uk/shashlik/shashlik_0.9.3.deb
 	sha256sums = a0a9daaeea0436ec8bd90b97112694974f7cf121d5a54083244488ff2d86dbaa
 
 pkgname = shashlik-bin
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..24b48cdaa635
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+shashlik-bin-*.pkg.tar.xz
+shashlik-bin-*.deb
+pkg/
+src/
diff --git a/PKGBUILD b/PKGBUILD
index 0c736fb922b7..65fcc3b48e5b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,25 +1,41 @@
-# Maintainer: Jameson Pugh <imntreal@gmail.com>
+# Maintainer: Fredy García <frealgagu at gmail dot com>
+# Contributor: Jameson Pugh <imntreal@gmail.com>
+# Contributor: tjbp (archlinux@tjbp.net)
  
 pkgname=shashlik-bin
 pkgver=0.9.3
-pkgrel=2
-pkgdesc="run Android applications on a standard Linux desktop"
-arch=('x86_64')
+pkgrel=3
+pkgdesc="A way to run Android applications on a standard Linux desktop as easily and simply as possible"
+arch=("x86_64")
 url="http://www.shashlik.io"
-license=('GPL')
-depends=('python' 'lib32-libgl' 'kdialog')
-conflicts=('shashlik')
-provides=('shashlik')
-source=("http://static.davidedmundson.co.uk/shashlik/shashlik_${pkgver}.deb")
-sha256sums=('a0a9daaeea0436ec8bd90b97112694974f7cf121d5a54083244488ff2d86dbaa')
- 
+license=("GPL")
+depends=("lib32-libgl")
+optdepends=("kdialog" "python")
+provides=("${pkgname%-bin}")
+conflicts=("${pkgname%-bin}")
+source=("${pkgname}-${pkgver}.deb::http://static.davidedmundson.co.uk/shashlik/${pkgname%-bin}_${pkgver}.deb")
+sha256sums=("a0a9daaeea0436ec8bd90b97112694974f7cf121d5a54083244488ff2d86dbaa")
+
+build() {
+  cd "${srcdir}"
+  
+  msg2 "Extracting data from debian package"
+  bsdtar -xf data.tar.xz -C .
+  
+  msg2 "Adding write permissions to folder /opt/shashlik/android/system"
+  chmod u+w "${srcdir}/opt/shashlik/android/system"
+}
+
 package() {
   cd "${srcdir}"
   
-  tar -xJC "${pkgdir}" -f data.tar.xz
   install -dm755 "${pkgdir}/usr/bin"
-  ln -s /opt/shashlik/bin/shashlik-run "${pkgdir}/usr/bin/"
-  ln -s /opt/shashlik/bin/shashlik-install "${pkgdir}/usr/bin/"
+  install -dm755 "${pkgdir}/opt/${pkgname}"
+  
+  msg2 "Installing application into /opt/${pkgname}"
+  cp -r "${srcdir}/opt/${pkgname%-bin}/"* "${pkgdir}/opt/${pkgname}/"
+
+  msg2 "Creating links into /usr/bin"
+  ln -s /opt/${pkgname}/bin/${pkgname%-bin}-run "${pkgdir}/usr/bin/"
+  ln -s /opt/${pkgname}/bin/${pkgname%-bin}-install "${pkgdir}/usr/bin/"
 }
- 
-# vim:set ts=2 sw=2 et: