summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorzxp198210052024-02-04 08:33:07 +0800
committerzxp198210052024-02-04 08:33:07 +0800
commit9cb749318742250b3105219aacd3c866afe9cd28 (patch)
treec8719e9acbf0846cad778b15c8cf90d57e2b8415
parent3138a3877482ab6a806568c9c39efcf2e93aa3d2 (diff)
downloadaur-9cb749318742250b3105219aacd3c866afe9cd28.tar.gz
fix errors
-rw-r--r--.SRCINFO9
-rw-r--r--PKGBUILD11
-rw-r--r--gridea.sh11
3 files changed, 11 insertions, 20 deletions
diff --git a/.SRCINFO b/.SRCINFO
index ba0d368c814d..65d37773cdc2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,15 @@
pkgbase = gridea-bin
pkgdesc = A static blog writing client.静态博客写作客户端
pkgver = 0.9.3
- pkgrel = 6
+ pkgrel = 7
url = https://gridea.dev
arch = x86_64
license = MIT
makedepends = squashfuse
depends = electron7
- depends = libx11
- depends = gdk-pixbuf2
- depends = libxext
+ depends = dbus-glib
depends = libdbusmenu-glib
depends = gtk2
- depends = dbus-glib
provides = gridea=0.9.3
conflicts = gridea
options = !emptydirs
@@ -21,6 +18,6 @@ pkgbase = gridea-bin
source = gridea.sh
sha256sums = 9538866b640e44e9fd54bc1b3a957d1625648f1c1dd6b942dcd73d22701ede4e
sha256sums = d5fd1669066ffaab84a9063cd2792ded7aca1f6f92a972f58ffb5173404b53d2
- sha256sums = 5ce46265f0335b03568aa06f7b4c57c5f8ffade7a226489ea39796be91a511bf
+ sha256sums = 0fb7b939a071f4a08476bdd5aa143d2aa8cd335c83309f9919be16cd5c3e2014
pkgname = gridea-bin
diff --git a/PKGBUILD b/PKGBUILD
index 602562ae266a..a45730b0a115 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@ pkgname=gridea-bin
_pkgname=Gridea
pkgver=0.9.3
_electronversion=7
-pkgrel=6
+pkgrel=7
pkgdesc="A static blog writing client.静态博客写作客户端"
arch=('x86_64')
url='https://gridea.dev'
@@ -14,12 +14,9 @@ provides=("${pkgname%-bin}=${pkgver}")
conflicts=("${pkgname%-bin}")
depends=(
"electron${_electronversion}"
- 'libx11'
- 'gdk-pixbuf2'
- 'libxext'
+ 'dbus-glib'
'libdbusmenu-glib'
'gtk2'
- 'dbus-glib'
)
makedepends=(
'squashfuse'
@@ -32,11 +29,11 @@ source=(
)
sha256sums=('9538866b640e44e9fd54bc1b3a957d1625648f1c1dd6b942dcd73d22701ede4e'
'd5fd1669066ffaab84a9063cd2792ded7aca1f6f92a972f58ffb5173404b53d2'
- '5ce46265f0335b03568aa06f7b4c57c5f8ffade7a226489ea39796be91a511bf')
+ '0fb7b939a071f4a08476bdd5aa143d2aa8cd335c83309f9919be16cd5c3e2014')
build() {
sed -e "s|@electronversion@|${_electronversion}|g" \
-e "s|@appname@|${pkgname%-bin}|g" \
- -e "s|@appasar@|app|g" \
+ -e "s|@runname@|app|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/gridea.sh b/gridea.sh
index c77c53567639..f9ced1432cfc 100644
--- a/gridea.sh
+++ b/gridea.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