optimized PKGBUILD

3 files changed, 26 insertions, 34 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3a9c0e081aa5..9c109bbd5d9c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,37 +1,16 @@
 pkgbase = raj-browser-bin
 	pkgdesc = A UI and privacy focussed browser for the web from the web.
 	pkgver = 2.0.5
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/Rajaniraiyn/raj-browser
 	arch = x86_64
 	license = custom
-	depends = nspr
-	depends = libcups
-	depends = libxkbcommon
-	depends = libxrandr
-	depends = libxcb
-	depends = libxcomposite
-	depends = dbus
-	depends = gcc-libs
-	depends = libx11
-	depends = cairo
-	depends = at-spi2-core
-	depends = nss
-	depends = gtk3
-	depends = hicolor-icon-theme
-	depends = libxdamage
-	depends = pango
-	depends = alsa-lib
-	depends = glibc
-	depends = wayland
-	depends = libdrm
-	depends = libxfixes
-	depends = glib2
-	depends = libxext
-	depends = expat
-	depends = mesa
+	depends = bash
+	depends = electron22
 	conflicts = raj-browser
 	source = raj-browser-2.0.5.deb::https://github.com/Rajaniraiyn/raj-browser/releases/download/v2.0.5/raj-browser_2.0.5_amd64.deb
+	source = raj-browser.sh
 	sha256sums = b0ff6a0abff0fe3f8510aa5f12bae954eab07cb0441ee5971685d3335fa91b79
+	sha256sums = 271e8a8613f1c8d7b6e17f3ea2db78e6116107b4fd9e4d1ea7115201c52c1d03
 
 pkgname = raj-browser-bin
diff --git a/PKGBUILD b/PKGBUILD
index 2f207d2f2846..b5a007c5ab52 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,18 +1,23 @@
 # Maintainer: zxp19821005 <zxp19821005 at 163 dot com>
 pkgname="raj-browser-bin"
 pkgver=2.0.5
-pkgrel=1
+pkgrel=2
 pkgdesc="A UI and privacy focussed browser for the web from the web."
 arch=('x86_64')
 license=('custom')
 conflicts=("${pkgname%-bin}")
 url="https://github.com/Rajaniraiyn/raj-browser"
-depends=('nspr' 'libcups' 'libxkbcommon' 'libxrandr' 'libxcb' 'libxcomposite' 'dbus' 'gcc-libs' 'libx11' 'cairo' 'at-spi2-core' 'nss' \
-    'gtk3' 'hicolor-icon-theme' 'libxdamage' 'pango' 'alsa-lib' 'glibc' 'wayland' 'libdrm' 'libxfixes' 'glib2' 'libxext' 'expat' 'mesa')
-source=("${pkgname%-bin}-${pkgver}.deb::${url}/releases/download/v${pkgver}/${pkgname%-bin}_${pkgver}_amd64.deb")
-sha256sums=('b0ff6a0abff0fe3f8510aa5f12bae954eab07cb0441ee5971685d3335fa91b79')
+depends=('bash' 'electron22')
+source=("${pkgname%-bin}-${pkgver}.deb::${url}/releases/download/v${pkgver}/${pkgname%-bin}_${pkgver}_amd64.deb"
+    "${pkgname%-bin}.sh")
+sha256sums=('b0ff6a0abff0fe3f8510aa5f12bae954eab07cb0441ee5971685d3335fa91b79'
+            '271e8a8613f1c8d7b6e17f3ea2db78e6116107b4fd9e4d1ea7115201c52c1d03')
 package(){
-    bsdtar -xf data.tar.xz -C "${pkgdir}"
-    sed "s|Utility|Network;Utility|g" -i "${pkgdir}/usr/share/applications/${pkgname%-bin}.desktop"
-    install -Dm644 "${pkgdir}/opt/${pkgname%-bin}/LICENSE"* -t "${pkgdir}/usr/share/licenses/${pkgname}"
+    bsdtar -xf "${srcdir}/data.tar.xz"
+    install -Dm755 "${srcdir}/${pkgname%-bin}.sh" "${pkgdir}/opt/${pkgname%-bin}/${pkgname%-bin}"
+    install -Dm644 "${srcdir}/opt/${pkgname%-bin}/resources/app.asar" "${pkgdir}/opt/${pkgname%-bin}/${pkgname%-bin}.asar"
+    sed "s| %U||g;s|Utility|Network;Utility|g" -i "${srcdir}/usr/share/applications/${pkgname%-bin}.desktop"
+    install -Dm644 "${srcdir}/usr/share/applications/${pkgname%-bin}.desktop" -t "${pkgdir}/usr/share/applications"
+    install -Dm644 "${srcdir}/opt/${pkgname%-bin}/LICENSE"* -t "${pkgdir}/usr/share/licenses/${pkgname}"
+    install -Dm644 "${srcdir}/usr/share/icons/hicolor/0x0/apps/${pkgname%-bin}.png" -t "${pkgdir}/usr/share/pixmaps"
 }
\ No newline at end of file
diff --git a/raj-browser.sh b/raj-browser.sh
new file mode 100644
index 000000000000..9fed7b3a4d9c
--- /dev/null
+++ b/raj-browser.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+_ELECTRON=/usr/bin/electron22
+_ASAR="/opt/raj-browser/raj-browser.asar"
+if [[ $EUID -ne 0 ]] || [[ $ELECTRON_RUN_AS_NODE ]]; then
+    exec ${_ELECTRON} ${_ASAR} "$@"
+else
+    exec ${_ELECTRON} ${_ASAR} --no-sandbox "$@"
+fi
\ No newline at end of file