update to 0.1.2102

3 files changed, 20 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0523c48c0243..f3c36af63ab4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 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.2101
+	pkgver = 0.1.2102
 	pkgrel = 1
 	url = https://launcher.tjmc.ru/
 	arch = aarch64
@@ -8,15 +8,15 @@ pkgbase = tjmc-launcher-bin
 	license = MIT
 	depends = hicolor-icon-theme
 	depends = electron23
-	provides = tjmc-launcher=0.1.2101
+	provides = tjmc-launcher=0.1.2102
 	conflicts = tjmc-launcher
-	source = LICENSE-0.1.2101::https://raw.githubusercontent.com/tjmcraft/TJMC-Launcher/v0.1.2101/LICENSE
+	source = LICENSE-0.1.2102::https://raw.githubusercontent.com/tjmcraft/TJMC-Launcher/v0.1.2102/LICENSE
 	source = tjmc-launcher.sh
 	sha256sums = 1a25e3b0f4bf16543e5f802cf6d9d189bcae27617ca8be936ad866a8955d9ce6
-	sha256sums = a99e67b077a4a23e520296db9ddd7851f93f08709e461c02c79298a47bde7d90
-	source_aarch64 = tjmc-launcher-0.1.2101-aarch64.deb::https://github.com/tjmcraft/TJMC-Launcher/releases/download/v0.1.2101/TJMC-Launcher-setup-arm64.deb
-	sha256sums_aarch64 = 5af70ff5040e990bd698160c1e952123275ce1530e21a80658f7a53d0c97df7a
-	source_x86_64 = tjmc-launcher-0.1.2101-x86_64.deb::https://github.com/tjmcraft/TJMC-Launcher/releases/download/v0.1.2101/TJMC-Launcher-setup-amd64.deb
-	sha256sums_x86_64 = 3ccc3d43a7c703a35c6019a458e6d68961611e5f9906596c20b813cd3170870f
+	sha256sums = 9f000b99bb76d849688063320e2933f2b7c1fe6fc884844edc35ba58c578adb3
+	source_aarch64 = tjmc-launcher-0.1.2102-aarch64.deb::https://github.com/tjmcraft/TJMC-Launcher/releases/download/v0.1.2102/TJMC-Launcher-setup-arm64.deb
+	sha256sums_aarch64 = 5470251ed524cc3e54f70002642df1b856d02c153f0b5923b1f668c242db0cba
+	source_x86_64 = tjmc-launcher-0.1.2102-x86_64.deb::https://github.com/tjmcraft/TJMC-Launcher/releases/download/v0.1.2102/TJMC-Launcher-setup-amd64.deb
+	sha256sums_x86_64 = 30605139a12f0f10b43aea926e21be201d02f816d4926aeee62221fe38cbe783
 
 pkgname = tjmc-launcher-bin
diff --git a/PKGBUILD b/PKGBUILD
index f6ebdeb99fb8..5b8b77c4ab6b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,8 @@
 # Maintainer: zxp19821005 <zxp19821005 at 163 dot com>
 pkgname=tjmc-launcher-bin
 _pkgname=TJMC-Launcher
-pkgver=0.1.2101
+pkgver=0.1.2102
+_electronversion=23
 pkgrel=1
 pkgdesc="A simple to use, extremely fast, and well supported app, that allows you to install pure and modded versions of Java Minecraft."
 arch=(
@@ -15,7 +16,7 @@ provides=("${pkgname%-bin}=${pkgver}")
 conflicts=("${pkgname%-bin}")
 depends=(
     'hicolor-icon-theme'
-    'electron23'
+    "electron${_electronversion}"
 )
 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")
@@ -24,12 +25,13 @@ source=(
     "${pkgname%-bin}.sh"
 )
 sha256sums=('1a25e3b0f4bf16543e5f802cf6d9d189bcae27617ca8be936ad866a8955d9ce6'
-            'a99e67b077a4a23e520296db9ddd7851f93f08709e461c02c79298a47bde7d90')
-sha256sums_aarch64=('5af70ff5040e990bd698160c1e952123275ce1530e21a80658f7a53d0c97df7a')
-sha256sums_x86_64=('3ccc3d43a7c703a35c6019a458e6d68961611e5f9906596c20b813cd3170870f')
+            '9f000b99bb76d849688063320e2933f2b7c1fe6fc884844edc35ba58c578adb3')
+sha256sums_aarch64=('5470251ed524cc3e54f70002642df1b856d02c153f0b5923b1f668c242db0cba')
+sha256sums_x86_64=('30605139a12f0f10b43aea926e21be201d02f816d4926aeee62221fe38cbe783')
 build() {
     bsdtar -xf "${srcdir}/data.tar.gz"
     sed "s|/opt/${_pkgname}/${pkgname%-bin} %U|${pkgname%-bin}|g" -i "${srcdir}/usr/share/applications/${pkgname%-bin}.desktop"
+    sed -i "s|@electronversion@|${_electronversion}|" "$srcdir/${pkgname%-bin}.sh"
 }
 package() {
     install -Dm755 "${srcdir}/${pkgname%-bin}.sh" "${pkgdir}/usr/bin/${pkgname%-bin}"
diff --git a/tjmc-launcher.sh b/tjmc-launcher.sh
index b31b511d0a82..09a458270cd9 100644
--- a/tjmc-launcher.sh
+++ b/tjmc-launcher.sh
@@ -1,11 +1,13 @@
 #!/bin/bash
-_ELECTRON=/usr/bin/electron23
 APPDIR="/usr/lib/tjmc-launcher"
 export PATH="${APPDIR}:${PATH}"
+export ELECTRON_IS_DEV=0
 #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} "$@"
+    cd $APPDIR
+    exec electron@electronversion@ ${_ASAR} "$@"
 else
-    exec ${_ELECTRON} ${_ASAR} --no-sandbox "$@"
+    cd $APPDIR
+    exec electron@electronversion@ ${_ASAR} --no-sandbox "$@"
 fi
\ No newline at end of file