fix errors

3 files changed, 27 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2e79fb8ca3f2..6dc3d89b77d9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,12 +1,11 @@
 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.20
-	pkgrel = 2
+	pkgrel = 3
 	url = https://launcher.tjmc.ru/
 	arch = aarch64
 	arch = x86_64
 	license = MIT
-	depends = bash
 	depends = hicolor-icon-theme
 	depends = electron23
 	provides = tjmc-launcher=0.1.20
@@ -14,7 +13,7 @@ pkgbase = tjmc-launcher-bin
 	source = LICENSE::https://raw.githubusercontent.com/tjmcraft/TJMC-Launcher/v0.1.20/LICENSE
 	source = tjmc-launcher.sh
 	sha256sums = 1a25e3b0f4bf16543e5f802cf6d9d189bcae27617ca8be936ad866a8955d9ce6
-	sha256sums = aaa56cbf9dd0dd94894e5ec2b6058f4b83416ca90ec467e3f2ef460f84c786b7
+	sha256sums = a99e67b077a4a23e520296db9ddd7851f93f08709e461c02c79298a47bde7d90
 	source_aarch64 = tjmc-launcher-0.1.20-aarch64.deb::https://github.com/tjmcraft/TJMC-Launcher/releases/download/v0.1.20/TJMC-Launcher-setup-arm64.deb
 	sha256sums_aarch64 = 6c625f2a144e8f9efae53fde383f112d3917ecf7886a57f9b31eaaadd7eafcc3
 	source_x86_64 = tjmc-launcher-0.1.20-x86_64.deb::https://github.com/tjmcraft/TJMC-Launcher/releases/download/v0.1.20/TJMC-Launcher-setup-amd64.deb
diff --git a/PKGBUILD b/PKGBUILD
index 286f39ceccfd..0c0aa6f18585 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,31 +1,39 @@
 # Maintainer: zxp19821005 <zxp19821005 at 163 dot com>
 pkgname=tjmc-launcher-bin
-_appname=TJMC-Launcher
+_pkgname=TJMC-Launcher
 pkgver=0.1.20
-pkgrel=2
+pkgrel=3
 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')
+arch=(
+    'aarch64'
+    'x86_64'
+)
 url="https://launcher.tjmc.ru/"
-_githuburl="https://github.com/tjmcraft/TJMC-Launcher"
+_ghurl="https://github.com/tjmcraft/TJMC-Launcher"
 license=('MIT')
 provides=("${pkgname%-bin}=${pkgver}")
 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/v${pkgver}/LICENSE"
-    "${pkgname%-bin}.sh")
+depends=(
+    'hicolor-icon-theme'
+    'electron23'
+)
+source_aarch64=("${pkgname%-bin}-${pkgver}-aarch64.deb::${_ghurl}/releases/download/v${pkgver}/${_pkgname}-setup-arm64.deb")
+source_x86_64=("${pkgname%-bin}-${pkgver}-x86_64.deb::${_ghurl}/releases/download/v${pkgver}/${_pkgname}-setup-amd64.deb")
+source=(
+    "LICENSE::https://raw.githubusercontent.com/tjmcraft/TJMC-Launcher/v${pkgver}/LICENSE"
+    "${pkgname%-bin}.sh"
+)
 sha256sums=('1a25e3b0f4bf16543e5f802cf6d9d189bcae27617ca8be936ad866a8955d9ce6'
-            'aaa56cbf9dd0dd94894e5ec2b6058f4b83416ca90ec467e3f2ef460f84c786b7')
+            'a99e67b077a4a23e520296db9ddd7851f93f08709e461c02c79298a47bde7d90')
 sha256sums_aarch64=('6c625f2a144e8f9efae53fde383f112d3917ecf7886a57f9b31eaaadd7eafcc3')
 sha256sums_x86_64=('abe7876f5d30e91068526401595b86f878ab072fa0cad9ee905d5f59386380f9')
-prepare() {
+build() {
     bsdtar -xf "${srcdir}/data.tar.gz"
-    sed "s|/opt/${_appname}/${pkgname%-bin} %U|${pkgname%-bin}|g" -i "${srcdir}/usr/share/applications/${pkgname%-bin}.desktop"
+    sed "s|/opt/${_pkgname}/${pkgname%-bin} %U|${pkgname%-bin}|g" -i "${srcdir}/usr/share/applications/${pkgname%-bin}.desktop"
 }
 package() {
     install -Dm755 "${srcdir}/${pkgname%-bin}.sh" "${pkgdir}/usr/bin/${pkgname%-bin}"
-    install -Dm644 "${srcdir}/opt/${_appname}/resources/app.asar" "${pkgdir}/opt/${pkgname%-bin}/${pkgname%-bin}.asar"
+    install -Dm644 "${srcdir}/opt/${_pkgname}/resources/app.asar" -t "${pkgdir}/usr/lib/${pkgname%-bin}"
     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" \
diff --git a/tjmc-launcher.sh b/tjmc-launcher.sh
index 61d7859156e6..b31b511d0a82 100644
--- a/tjmc-launcher.sh
+++ b/tjmc-launcher.sh
@@ -1,6 +1,9 @@
 #!/bin/bash
 _ELECTRON=/usr/bin/electron23
-_ASAR="/opt/tjmc-launcher/tjmc-launcher.asar"
+APPDIR="/usr/lib/tjmc-launcher"
+export PATH="${APPDIR}:${PATH}"
+#export LD_LIBRARY_PATH="${APPDIR}/swiftshader:${LD_LIBRARY_PATH}"
+_ASAR="${APPDIR}/app.asar"
 if [[ $EUID -ne 0 ]] || [[ $ELECTRON_RUN_AS_NODE ]]; then
     exec ${_ELECTRON} ${_ASAR} "$@"
 else