optimized PKGBUILD

3 files changed, 31 insertions, 32 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0915446a28d5..2021a1c4a778 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,39 +1,20 @@
 pkgbase = tjmc-launcher-bin
 	pkgdesc = A simple to use, extremely fast, and well supported app, that allows you to install pure and modded versions of Java Minecraft.
 	pkgver = 0.1.1008
-	pkgrel = 1
+	pkgrel = 2
 	url = https://launcher.tjmc.ru/
 	arch = aarch64
 	arch = x86_64
 	license = MIT
-	depends = libxfixes
+	depends = bash
 	depends = hicolor-icon-theme
-	depends = nss
-	depends = alsa-lib
-	depends = cairo
-	depends = libxrandr
-	depends = at-spi2-core
-	depends = glibc
-	depends = gtk3
-	depends = mesa
-	depends = nspr
-	depends = dbus
-	depends = libdrm
-	depends = libx11
-	depends = pango
-	depends = glib2
-	depends = libcups
-	depends = libxcomposite
-	depends = libxdamage
-	depends = libxext
-	depends = libxcb
-	depends = libxkbcommon
-	depends = expat
-	depends = gcc-libs
+	depends = electron23
+	provides = tjmc-launcher
 	conflicts = tjmc-launcher
-	conflicts = tjmc-launcher-appimage
 	source = LICENSE::https://raw.githubusercontent.com/tjmcraft/TJMC-Launcher/main/LICENSE
+	source = tjmc-launcher.sh
 	sha256sums = 1a25e3b0f4bf16543e5f802cf6d9d189bcae27617ca8be936ad866a8955d9ce6
+	sha256sums = aaa56cbf9dd0dd94894e5ec2b6058f4b83416ca90ec467e3f2ef460f84c786b7
 	source_aarch64 = tjmc-launcher-0.1.1008-aarch64.deb::https://github.com/tjmcraft/TJMC-Launcher/releases/download/v0.1.1008/TJMC-Launcher-setup-arm64.deb
 	sha256sums_aarch64 = 06c85c1638ffe2284587c37bc4426f5fb4bbdd8a4b057f2fc8e7b389b045bdb9
 	source_x86_64 = tjmc-launcher-0.1.1008-x86_64.deb::https://github.com/tjmcraft/TJMC-Launcher/releases/download/v0.1.1008/TJMC-Launcher-setup-amd64.deb
diff --git a/PKGBUILD b/PKGBUILD
index 7ba19deba195..4d0b14536087 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,23 +2,33 @@
 pkgname="tjmc-launcher-bin"
 _appname="TJMC-Launcher"
 pkgver=0.1.1008
-pkgrel=1
+pkgrel=2
 pkgdesc="A simple to use, extremely fast, and well supported app, that allows you to install pure and modded versions of Java Minecraft."
 arch=('aarch64' 'x86_64')
 url="https://launcher.tjmc.ru/"
 _githuburl="https://github.com/tjmcraft/TJMC-Launcher"
 license=('MIT')
-conflicts=("${pkgname%-bin}" "${pkgname%-bin}-appimage")
-depends=('libxfixes' 'hicolor-icon-theme' 'nss' 'alsa-lib' 'cairo' 'libxrandr' 'at-spi2-core' 'glibc' 'gtk3' 'mesa' 'nspr' 'dbus' \
-    'libdrm' 'libx11' 'pango' 'glib2' 'libcups' 'libxcomposite' 'libxdamage' 'libxext' 'libxcb' 'libxkbcommon' 'expat' 'gcc-libs')
+provides=("${pkgname%-bin}")
+conflicts=("${pkgname%-bin}")
+depends=('bash' 'hicolor-icon-theme' 'electron23')
 source_aarch64=("${pkgname%-bin}-${pkgver}-aarch64.deb::${_githuburl}/releases/download/v${pkgver}/${_appname}-setup-arm64.deb")
 source_x86_64=("${pkgname%-bin}-${pkgver}-x86_64.deb::${_githuburl}/releases/download/v${pkgver}/${_appname}-setup-amd64.deb")
-source=("LICENSE::https://raw.githubusercontent.com/tjmcraft/TJMC-Launcher/main/LICENSE")
-sha256sums=('1a25e3b0f4bf16543e5f802cf6d9d189bcae27617ca8be936ad866a8955d9ce6')
+source=("LICENSE::https://raw.githubusercontent.com/tjmcraft/TJMC-Launcher/main/LICENSE"
+    "${pkgname%-bin}.sh")
+sha256sums=('1a25e3b0f4bf16543e5f802cf6d9d189bcae27617ca8be936ad866a8955d9ce6'
+            'aaa56cbf9dd0dd94894e5ec2b6058f4b83416ca90ec467e3f2ef460f84c786b7')
 sha256sums_aarch64=('06c85c1638ffe2284587c37bc4426f5fb4bbdd8a4b057f2fc8e7b389b045bdb9')
 sha256sums_x86_64=('274c6ad9ab731c2fd3eeb939cc02761753b7eea765141a2dba09f94b7ac42a79')
     
 package() {
-    bsdtar -xf "${srcdir}/data.tar.gz" -C "${pkgdir}"
+    bsdtar -xf "${srcdir}/data.tar.gz"
+    install -Dm755 "${srcdir}/${pkgname%-bin}.sh" "${pkgdir}/opt/${pkgname%-bin}/${pkgname%-bin}"
+    install -Dm644 "${srcdir}/opt/${_appname}/resources/app.asar" "${pkgdir}/opt/${pkgname%-bin}/${pkgname%-bin}.asar"
+    sed "s|/opt/${_appname}/${pkgname%-bin} %U|/opt/${pkgname%-bin}/${pkgname%-bin}|g" -i "${srcdir}/usr/share/applications/${pkgname%-bin}.desktop"
+    install -Dm644 "${srcdir}/usr/share/applications/${pkgname%-bin}.desktop" -t "${pkgdir}/usr/share/applications"
+    for _icons in 16x16 32x32 48x48 64x64 128x128 256x256 512x512;do
+        install -Dm644 "${srcdir}/usr/share/icons/hicolor/${_icons}/apps/${pkgname%-bin}.png" \
+            -t "${pkgdir}/usr/share/icons/hicolor/${_icons}/apps"
+    done
     install -Dm644 "${srcdir}/LICENSE" -t "${pkgdir}/usr/share/licenses/${pkgname}"
 }
\ No newline at end of file
diff --git a/tjmc-launcher.sh b/tjmc-launcher.sh
new file mode 100644
index 000000000000..61d7859156e6
--- /dev/null
+++ b/tjmc-launcher.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+_ELECTRON=/usr/bin/electron23
+_ASAR="/opt/tjmc-launcher/tjmc-launcher.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