fix errors

3 files changed, 23 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f80f52b7172a..9967a590c740 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,21 +1,19 @@
 pkgbase = frosch-bin
 	pkgdesc = Frosch, software para juego de rana electrónica o rana digital.
 	pkgver = 2.0.2
-	pkgrel = 5
+	pkgrel = 6
 	url = https://github.com/ivanrey/Frosch
 	arch = i686
 	arch = x86_64
 	license = MIT
-	makedepends = asar
 	makedepends = gendesk
-	depends = bash
 	depends = electron11
 	provides = frosch=2.0.2
 	conflicts = frosch
 	source = LICENSE::https://raw.githubusercontent.com/ivanrey/Frosch/v2.0.2/LICENSE
 	source = frosch.sh
 	sha256sums = 70d564391aa89ca77317a0716d27d450d939c41d0554a66da392b28784d6fa7d
-	sha256sums = 3645e814b95471b0f8ae979a5c4567bf977e85ef544cebdbed257f9bdc934168
+	sha256sums = 7d31e6c20fc5010a1e58d6579301c378608a4b5ba9c8f58d989735392d439d03
 	source_i686 = frosch-2.0.2-i686.zip::https://github.com/ivanrey/Frosch/releases/download/v2.0.2/Frosch-linux-ia32.zip
 	sha256sums_i686 = 78ca0dbd64a0e6e1155632219d3990a76358abd8c385ef88a7094edc1a8aa8b6
 	source_x86_64 = frosch-2.0.2-x86_64.zip::https://github.com/ivanrey/Frosch/releases/download/v2.0.2/Frosch-linux-x64.zip
diff --git a/PKGBUILD b/PKGBUILD
index a712d71c5ca5..8d71160ac9c8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,30 +2,37 @@
 pkgname=frosch-bin
 _appname=Frosch
 pkgver=2.0.2
-pkgrel=5
+pkgrel=6
 pkgdesc="Frosch, software para juego de rana electrónica o rana digital."
 arch=('i686' 'x86_64')
 url="https://github.com/ivanrey/Frosch"
 license=('MIT')
 provides=("${pkgname%-bin}=${pkgver}")
 conflicts=("${pkgname%-bin}")
-depends=('bash' 'electron11')
-makedepends=('asar' 'gendesk')
+depends=(
+    'electron11'
+)
+makedepends=(
+    'gendesk'
+)
 source_i686=("${pkgname%-bin}-${pkgver}-i686.zip::${url}/releases/download/v${pkgver}/${_appname}-linux-ia32.zip")
 source_x86_64=("${pkgname%-bin}-${pkgver}-x86_64.zip::${url}/releases/download/v${pkgver}/${_appname}-linux-x64.zip")
-source=("LICENSE::https://raw.githubusercontent.com/ivanrey/Frosch/v${pkgver}/LICENSE"
-    "${pkgname%-bin}.sh")
+source=(
+    "LICENSE::https://raw.githubusercontent.com/ivanrey/Frosch/v${pkgver}/LICENSE"
+    "${pkgname%-bin}.sh"
+)
 sha256sums=('70d564391aa89ca77317a0716d27d450d939c41d0554a66da392b28784d6fa7d'
-            '3645e814b95471b0f8ae979a5c4567bf977e85ef544cebdbed257f9bdc934168')
+            '7d31e6c20fc5010a1e58d6579301c378608a4b5ba9c8f58d989735392d439d03')
 sha256sums_i686=('78ca0dbd64a0e6e1155632219d3990a76358abd8c385ef88a7094edc1a8aa8b6')
 sha256sums_x86_64=('16841565eecd5b9946711cfafdf9a0959c60fada1870c624f5d65f31cc31252f')
-prepare() {
-    asar pack "${srcdir}/resources/app" "${srcdir}/${pkgname%-bin}.asar"
-    gendesk -f -n --categories "Game" --name "${_appname}" --exec "${pkgname%-bin}"
+build() {
+    gendesk -q -f -n --categories "Game" --name "${_appname}" --exec "${pkgname%-bin}"
 }
 package() {
     install -Dm755 "${srcdir}/${pkgname%-bin}.sh" "${pkgdir}/usr/bin/${pkgname%-bin}"
-    install -Dm644 "${srcdir}/${pkgname%-bin}.asar" -t "${pkgdir}/opt/${pkgname%-bin}"
+    install -Dm755 -d "${pkgdir}/usr/lib/${pkgname%-bin}"
+    cp -r "${srcdir}/resources/app" "${pkgdir}/usr/lib/${pkgname%-bin}"
+    install -Dm644 "${srcdir}/swiftshader/"* -t "${pkgdir}/usr/lib/${pkgname%-bin}/swiftshader"
     install -Dm644 "${srcdir}/resources/app/icono.png" "${pkgdir}/usr/share/pixmaps/${pkgname%-bin}.png"
     install -Dm644 "${srcdir}/${pkgname%-bin}.desktop" -t "${pkgdir}/usr/share/applications"
     install -Dm644 "${srcdir}/LICENSE" -t "${pkgdir}/usr/share/licenses/${pkgname}"
diff --git a/frosch.sh b/frosch.sh
index 8b870d6f3ae5..11647f052013 100644
--- a/frosch.sh
+++ b/frosch.sh
@@ -1,6 +1,9 @@
 #!/bin/bash
 _ELECTRON=/usr/bin/electron11
-_ASAR="/opt/frosch/frosch.asar"
+APPDIR="/usr/lib/frosch"
+export PATH="${APPDIR}:${PATH}"
+export LD_LIBRARY_PATH="${APPDIR}/swiftshader:${LD_LIBRARY_PATH}"
+_ASAR="${APPDIR}/app"
 if [[ $EUID -ne 0 ]] || [[ $ELECTRON_RUN_AS_NODE ]]; then
     exec ${_ELECTRON} ${_ASAR} "$@"
 else