optimized PKGBUILD

3 files changed, 24 insertions, 38 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ed587f0aa898..e3c870205dbe 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,40 +1,19 @@
 pkgbase = frosch-bin
 	pkgdesc = Frosch, software para juego de rana electrónica o rana digital.
 	pkgver = 2.0.2
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/ivanrey/Frosch
 	arch = i686
 	arch = x86_64
 	license = MIT
-	depends = nss
-	depends = libcups
-	depends = glibc
-	depends = at-spi2-core
-	depends = glib2
-	depends = libxcomposite
-	depends = gcc-libs
-	depends = nspr
-	depends = libxrandr
-	depends = alsa-lib
-	depends = libx11
-	depends = libxkbcommon
-	depends = libxfixes
-	depends = cairo
-	depends = expat
-	depends = libxdamage
-	depends = libxext
-	depends = gdk-pixbuf2
-	depends = libdrm
-	depends = mesa
-	depends = dbus
-	depends = gtk3
-	depends = pango
-	depends = libxcb
+	makedepends = asar
+	depends = electron11
+	depends = bash
 	conflicts = frosch
-	conflicts = frosch-appimage
-	noextract = frosch-2.0.2-x86_64.zip
 	source = LICENSE::https://raw.githubusercontent.com/ivanrey/Frosch/master/LICENSE
+	source = frosch.sh
 	sha256sums = 70d564391aa89ca77317a0716d27d450d939c41d0554a66da392b28784d6fa7d
+	sha256sums = e57e0959b9cfc7c7fc863991ce487e865020e369b757a0438bf5b4fe55a1a424
 	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 cce06675ae87..7e8f63154100 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,26 +1,27 @@
 # Maintainer: zxp19821005 <zxp19821005 at 163 dot com>
 pkgname=frosch-bin
 pkgver=2.0.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Frosch, software para juego de rana electrónica o rana digital."
 arch=('i686' 'x86_64')
 url="https://github.com/ivanrey/Frosch"
 license=('MIT')
-depends=('nss' 'libcups' 'glibc' 'at-spi2-core' 'glib2' 'libxcomposite' 'gcc-libs' 'nspr' 'libxrandr' 'alsa-lib' 'libx11' 'libxkbcommon' \
-    'libxfixes' 'cairo' 'expat' 'libxdamage' 'libxext' 'gdk-pixbuf2' 'libdrm' 'mesa' 'dbus' 'gtk3' 'pango' 'libxcb')
-conflicts=("${pkgname%-bin}" "${pkgname%-bin}-appimage")
+depends=('electron11' 'bash')
+makedepends=('asar')
+conflicts=("${pkgname%-bin}")
 source_i686=("${pkgname%-bin}-${pkgver}-i686.zip::${url}/releases/download/v${pkgver}/Frosch-linux-ia32.zip")
 source_x86_64=("${pkgname%-bin}-${pkgver}-x86_64.zip::${url}/releases/download/v${pkgver}/Frosch-linux-x64.zip")
-source=("LICENSE::https://raw.githubusercontent.com/ivanrey/Frosch/master/LICENSE")
-noextract=("${pkgname%-bin}-${pkgver}-${CARCH}.zip")
-sha256sums=('70d564391aa89ca77317a0716d27d450d939c41d0554a66da392b28784d6fa7d')
+source=("LICENSE::https://raw.githubusercontent.com/ivanrey/Frosch/master/LICENSE"
+    "${pkgname%-bin}.sh")
+sha256sums=('70d564391aa89ca77317a0716d27d450d939c41d0554a66da392b28784d6fa7d'
+            'e57e0959b9cfc7c7fc863991ce487e865020e369b757a0438bf5b4fe55a1a424')
 sha256sums_i686=('78ca0dbd64a0e6e1155632219d3990a76358abd8c385ef88a7094edc1a8aa8b6')
 sha256sums_x86_64=('16841565eecd5b9946711cfafdf9a0959c60fada1870c624f5d65f31cc31252f')
 package() {
-    install -Dm755 -d "${pkgdir}/opt/${pkgname%-bin}"
-    bsdtar -xf "${srcdir}/${pkgname%-bin}-${pkgver}-${CARCH}.zip" -C "${pkgdir}/opt/${pkgname%-bin}"
-    install -Dm644 "${pkgdir}/opt/${pkgname%-bin}/resources/app/icono.png" "${pkgdir}/usr/share/pixmaps/${pkgname%-bin}.png"
-    gendesk -f --icon "${pkgname%-bin}" --categories "Game" --name "Frosch" --exec "/opt/${pkgname%-bin}/${pkgname%-bin} %U"
+    install -Dm755 "${srcdir}/${pkgname%-bin}.sh" "${pkgdir}/opt/${pkgname%-bin}/${pkgname%-bin}"
+    asar pack "${srcdir}/resources/app" "${pkgdir}/opt/${pkgname%-bin}/${pkgname%-bin}.asar"
+    install -Dm644 "${srcdir}/resources/app/icono.png" "${pkgdir}/usr/share/pixmaps/${pkgname%-bin}.png"
+    gendesk -f -n --icon "${pkgname%-bin}" --categories "Game" --name "Frosch" --exec "/opt/${pkgname%-bin}/${pkgname%-bin}"
     install -Dm644 "${srcdir}/${pkgname%-bin}.desktop" -t "${pkgdir}/usr/share/applications"
     install -Dm644 "${srcdir}/LICENSE" -t "${pkgdir}/usr/share/licenses/${pkgname}"
 }
\ No newline at end of file
diff --git a/frosch.sh b/frosch.sh
new file mode 100644
index 000000000000..162843cef01c
--- /dev/null
+++ b/frosch.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+if [[ $EUID -ne 0 ]] || [[ $ELECTRON_RUN_AS_NODE ]]; then
+    exec electron11 /opt/frosch/frosch.asar "$@"
+else
+    exec electron11 --no-sandbox /opt/frosch/frosch.asar "$@"
+fi
\ No newline at end of file