summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorzxp198210052024-02-05 17:32:08 +0800
committerzxp198210052024-02-05 17:32:08 +0800
commit9b31218eb7cd35411085635563e1869b0696ea32 (patch)
treea94bc79b18769210a1e507c751aaf2397a5152fa
parent153dd7586d3532dda144bdc3b53a7d03d13d0659 (diff)
downloadaur-9b31218eb7cd35411085635563e1869b0696ea32.tar.gz
fix errors
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD6
-rw-r--r--monit.sh11
3 files changed, 9 insertions, 12 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 3b8e21611c19..64d5d0aec050 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = monit-bin
pkgdesc = Desktop widgets that display various information.展示各种信息的桌面小组件
pkgver = 0.8.1
- pkgrel = 5
+ pkgrel = 6
url = https://monit.fzf404.art/
arch = x86_64
license = MIT
@@ -17,6 +17,6 @@ pkgbase = monit-bin
source = monit.sh
sha256sums = 380996cea6c85387a5d0f91bd725c32f7007ecf1ee0bb5f248bb998430f7877e
sha256sums = ff7c320ce0d7663a98fe147ee42af554853380f3ba2a2aad67091bdbf895a276
- sha256sums = 5ce46265f0335b03568aa06f7b4c57c5f8ffade7a226489ea39796be91a511bf
+ sha256sums = 0fb7b939a071f4a08476bdd5aa143d2aa8cd335c83309f9919be16cd5c3e2014
pkgname = monit-bin
diff --git a/PKGBUILD b/PKGBUILD
index 958c64c8ebeb..f9cafddbaeb4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@ pkgname=monit-bin
_appname=Monit
pkgver=0.8.1
_electronversion=21
-pkgrel=5
+pkgrel=6
pkgdesc="Desktop widgets that display various information.展示各种信息的桌面小组件"
arch=('x86_64')
url="https://monit.fzf404.art/"
@@ -27,11 +27,11 @@ source=(
)
sha256sums=('380996cea6c85387a5d0f91bd725c32f7007ecf1ee0bb5f248bb998430f7877e'
'ff7c320ce0d7663a98fe147ee42af554853380f3ba2a2aad67091bdbf895a276'
- '5ce46265f0335b03568aa06f7b4c57c5f8ffade7a226489ea39796be91a511bf')
+ '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"
chmod a+x "${srcdir}/${pkgname%-bin}-${pkgver}.AppImage"
"${srcdir}/${pkgname%-bin}-${pkgver}.AppImage" --appimage-extract > /dev/null
diff --git a/monit.sh b/monit.sh
index c77c53567639..f9ced1432cfc 100644
--- a/monit.sh
+++ b/monit.sh
@@ -1,17 +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
- cd "${_APPDIR}"
- exec electron@electronversion@ "${_ASAR}" "$@"
- exit
+ exec electron@electronversion@ "${_RUNNAME}" "$@" || exit $?
else
- cd "${_APPDIR}"
- exec electron@electronversion@ "${_ASAR}" --no-sandbox "$@"
- exit
+ exec electron@electronversion@ "${_RUNNAME}" --no-sandbox "$@" || exit $?
fi \ No newline at end of file