summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorzxp198210052024-02-26 13:56:36 +0800
committerzxp198210052024-02-26 13:56:36 +0800
commitd3134433c8876be1e00c1a6431abf833d9a94b19 (patch)
tree37c02c1e3f45df153ac235151b66bf1abe718ffe
parent530a80472826897c32fa1093f6778229c21c6814 (diff)
downloadaur-d3134433c8876be1e00c1a6431abf833d9a94b19.tar.gz
fix errors
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD8
-rw-r--r--krux-installer.sh9
3 files changed, 10 insertions, 11 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 8ee3e81e604c..3393715a6d2c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = krux-installer-bin
pkgdesc = A GUI based application to flash Krux firmware on K210 based devices
pkgver = 0.0.11
- pkgrel = 1
+ pkgrel = 2
url = https://github.com/selfcustody/krux-installer
arch = x86_64
license = MIT
@@ -19,6 +19,6 @@ pkgbase = krux-installer-bin
source = krux-installer.sh
sha256sums = 89fc4065390ac578195e7fc01e85bf2acc17e53193c3262114b03fbd82459dae
sha256sums = 29eee3e9d9c5dd67213ec3ab4a7eef57a1224750e2e9aab3a278177a9444a355
- sha256sums = d4272fed78cdcacd9edfb019134ac485d65b43f4d8c7a4179edbaed56af9b231
+ sha256sums = 0fb7b939a071f4a08476bdd5aa143d2aa8cd335c83309f9919be16cd5c3e2014
pkgname = krux-installer-bin
diff --git a/PKGBUILD b/PKGBUILD
index e8c7a20db21e..42e56b5e534d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@ pkgname=krux-installer-bin
_pkgname="org.selfcustody.${pkgname%-bin}"
pkgver=0.0.11
_electronversion=28
-pkgrel=1
+pkgrel=2
pkgdesc="A GUI based application to flash Krux firmware on K210 based devices"
arch=('x86_64')
url="https://github.com/selfcustody/krux-installer"
@@ -27,13 +27,13 @@ source=(
)
sha256sums=('89fc4065390ac578195e7fc01e85bf2acc17e53193c3262114b03fbd82459dae'
'29eee3e9d9c5dd67213ec3ab4a7eef57a1224750e2e9aab3a278177a9444a355'
- 'd4272fed78cdcacd9edfb019134ac485d65b43f4d8c7a4179edbaed56af9b231')
+ '0fb7b939a071f4a08476bdd5aa143d2aa8cd335c83309f9919be16cd5c3e2014')
build() {
sed -e "s|@electronversion@|${_electronversion}|g" \
-e "s|@appname@|${pkgname%-bin}|g" \
- -e "s|@appasar@|app.asar|g" \
+ -e "s|@runname@|app.asar|g" \
-i "${srcdir}/${pkgname%-bin}.sh"
- bsdtar -xf "${srcdir}/data.tar.xz"
+ bsdtar -xf "${srcdir}/data."*
sed "s|/opt/${pkgname%-bin}/||g;s|org.selfcustody.${pkgname%-bin}|${pkgname%-bin}|g" \
-i "${srcdir}/usr/share/applications/${pkgname%-bin}.desktop"
}
diff --git a/krux-installer.sh b/krux-installer.sh
index aacd8f895847..f9ced1432cfc 100644
--- a/krux-installer.sh
+++ b/krux-installer.sh
@@ -1,15 +1,14 @@
#!/bin/sh
set -e
_APPDIR="/usr/lib/@appname@"
-_ASAR="${_APPDIR}/@appasar@"
+_RUNNAME="${_APPDIR}/@runname@"
export PATH="${_APPDIR}:${PATH}"
export LD_LIBRARY_PATH="${_APPDIR}/swiftshader:${_APPDIR}/lib:${LD_LIBRARY_PATH}"
export ELECTRON_IS_DEV=0
export NODE_ENV=production
cd "${_APPDIR}"
if [[ $EUID -ne 0 ]] || [[ $ELECTRON_RUN_AS_NODE ]]; then
- exec electron@electronversion@ "${_ASAR}" "$@"
+ exec electron@electronversion@ "${_RUNNAME}" "$@" || exit $?
else
- exec electron@electronversion@ "${_ASAR}" --no-sandbox "$@"
-fi
-exit \ No newline at end of file
+ exec electron@electronversion@ "${_RUNNAME}" --no-sandbox "$@" || exit $?
+fi \ No newline at end of file