summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorzxp198210052024-02-05 15:46:04 +0800
committerzxp198210052024-02-05 15:46:04 +0800
commit50e9e827e44ea513eb896fc277822f62638964f4 (patch)
tree84727805aa90780f500400eeba4dbc291231f689
parent54d50bb424e9caaf11e688dc7784c0b0d1bdf545 (diff)
downloadaur-50e9e827e44ea513eb896fc277822f62638964f4.tar.gz
fix errors
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD10
-rw-r--r--zhiximind-desktop.sh11
3 files changed, 13 insertions, 16 deletions
diff --git a/.SRCINFO b/.SRCINFO
index f90b9fe6edaf..44da48c8795f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,10 +1,10 @@
pkgbase = zhiximind-desktop-bin
pkgdesc = 知犀思维导图官方版
pkgver = 2.1.4.0
- pkgrel = 4
+ pkgrel = 5
url = https://www.zhixi.com
arch = x86_64
- license = custom
+ license = ISC
makedepends = asar
depends = electron21
depends = hicolor-icon-theme
@@ -14,7 +14,7 @@ pkgbase = zhiximind-desktop-bin
source = LICENSE-2.1.4.0.html::https://www.zhixi.com/user-agreement
source = zhiximind-desktop.sh
sha256sums = 972aed41c6a54acf99f0ccb60047f52ba9fe264fbee04a9a0c4746df7a33eb53
- sha256sums = 8db7ab7d6ba34fe6997140ad9d6bbaeafd52cdc0f1ba486038226270243d1b41
- sha256sums = 5ce46265f0335b03568aa06f7b4c57c5f8ffade7a226489ea39796be91a511bf
+ sha256sums = 2b4abfdc101c27d844600bf83d76be8a5b1ba3934db79166b5a85c82e73ca1c0
+ sha256sums = 0fb7b939a071f4a08476bdd5aa143d2aa8cd335c83309f9919be16cd5c3e2014
pkgname = zhiximind-desktop-bin
diff --git a/PKGBUILD b/PKGBUILD
index c93176abee0b..08eaf5d07b86 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,11 +2,11 @@
pkgname=zhiximind-desktop-bin
pkgver=2.1.4.0
_electronversion=21
-pkgrel=4
+pkgrel=5
pkgdesc="知犀思维导图官方版"
arch=('x86_64')
url="https://www.zhixi.com"
-license=('custom')
+license=('ISC')
provides=("${pkgname%-bin}=${pkgver}")
conflicts=("${pkgname%-bin}")
depends=(
@@ -22,12 +22,12 @@ source=(
"${pkgname%-bin}.sh"
)
sha256sums=('972aed41c6a54acf99f0ccb60047f52ba9fe264fbee04a9a0c4746df7a33eb53'
- '8db7ab7d6ba34fe6997140ad9d6bbaeafd52cdc0f1ba486038226270243d1b41'
- '5ce46265f0335b03568aa06f7b4c57c5f8ffade7a226489ea39796be91a511bf')
+ '2b4abfdc101c27d844600bf83d76be8a5b1ba3934db79166b5a85c82e73ca1c0'
+ '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"
asar e "${srcdir}/opt/${pkgname%-bin}/resources/app.asar" "${srcdir}/app.asar.unpacked"
diff --git a/zhiximind-desktop.sh b/zhiximind-desktop.sh
index c77c53567639..f9ced1432cfc 100644
--- a/zhiximind-desktop.sh
+++ b/zhiximind-desktop.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