summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorzxp198210052024-02-07 13:26:23 +0800
committerzxp198210052024-02-07 13:26:23 +0800
commit4095b042c71a50eca2beefd34df3826fec49374e (patch)
treeff7926519e00a53e65207d789c754c9143e4d795
parentb5ce7b1df3ad1ed63652609e02928d6d94472411 (diff)
downloadaur-4095b042c71a50eca2beefd34df3826fec49374e.tar.gz
fix errors
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD6
-rw-r--r--lemmy-modder-app.sh9
3 files changed, 9 insertions, 10 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 1bbeea2fc66e..a4e7138aad3e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = lemmy-modder-app-bin
pkgdesc = A Lemmy moderation tool for community moderators and site admins, but on steroids.
pkgver = 0.4.0
- pkgrel = 3
+ pkgrel = 4
url = https://github.com/tgxn/lemmy-modder
arch = x86_64
license = MIT
@@ -13,6 +13,6 @@ pkgbase = lemmy-modder-app-bin
source = lemmy-modder-app.sh
sha256sums = 14a0d44f25b697e85095c8d4edd1d054182e0cff47214b886b0a37891c4947d9
sha256sums = cd61b504273b9fe1901027491f0a1d6164fe20053ebe74838ba7783760424759
- sha256sums = d4272fed78cdcacd9edfb019134ac485d65b43f4d8c7a4179edbaed56af9b231
+ sha256sums = 0fb7b939a071f4a08476bdd5aa143d2aa8cd335c83309f9919be16cd5c3e2014
pkgname = lemmy-modder-app-bin
diff --git a/PKGBUILD b/PKGBUILD
index 2b238bbc6486..de84a53a03c2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@ pkgname=lemmy-modder-app-bin
_pkgname="Lemmy Modder"
pkgver=0.4.0
_electronversion=25
-pkgrel=3
+pkgrel=4
pkgdesc="A Lemmy moderation tool for community moderators and site admins, but on steroids."
arch=("x86_64")
url="https://github.com/tgxn/lemmy-modder"
@@ -20,11 +20,11 @@ source=(
)
sha256sums=('14a0d44f25b697e85095c8d4edd1d054182e0cff47214b886b0a37891c4947d9'
'cd61b504273b9fe1901027491f0a1d6164fe20053ebe74838ba7783760424759'
- '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"
sed "s|\"/opt/${_pkgname}/${pkgname%-bin}\"|${pkgname%-bin}|g" -i "${srcdir}/usr/share/applications/${pkgname%-bin}.desktop"
diff --git a/lemmy-modder-app.sh b/lemmy-modder-app.sh
index aacd8f895847..f9ced1432cfc 100644
--- a/lemmy-modder-app.sh
+++ b/lemmy-modder-app.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