fix errors

3 files changed, 12 insertions, 8 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 60517c68ac1c..154260940f85 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = gridea-bin
-	pkgdesc = A static blog writing client
+	pkgdesc = A static blog writing client.静态博客写作客户端
 	pkgver = 0.9.3
-	pkgrel = 1
+	pkgrel = 2
 	url = https://gridea.dev
 	arch = x86_64
 	license = MIT
@@ -9,11 +9,12 @@ pkgbase = gridea-bin
 	depends = electron7
 	depends = bash
 	provides = gridea
+	conflicts = gridea
 	source = gridea-0.9.3.AppImage::https://github.com/getgridea/gridea/releases/download/v0.9.3/Gridea-0.9.3.AppImage
 	source = LICENSE::https://raw.githubusercontent.com/getgridea/gridea/master/LICENSE
 	source = gridea.sh
 	sha256sums = 9538866b640e44e9fd54bc1b3a957d1625648f1c1dd6b942dcd73d22701ede4e
 	sha256sums = d5fd1669066ffaab84a9063cd2792ded7aca1f6f92a972f58ffb5173404b53d2
-	sha256sums = 92a2f6e882f85218006619245a814ba8ddc58dbe0121fa9c57d3855acfb4fdc7
+	sha256sums = 863017a1770322545b623396bd5fcfa47d71621e45ca3861f711b381d10a5328
 
 pkgname = gridea-bin
diff --git a/PKGBUILD b/PKGBUILD
index a3ffb323d256..c65d6f2235ab 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,13 +2,14 @@
 # Contributor: Dimitris Kiziridis <ragouel at outlook dot com>
 pkgname=gridea-bin
 pkgver=0.9.3
-pkgrel=1
-pkgdesc="A static blog writing client"
+pkgrel=2
+pkgdesc="A static blog writing client.静态博客写作客户端"
 arch=('x86_64')
 url='https://gridea.dev'
 _githuburl="https://github.com/getgridea/gridea"
 license=('MIT')
 provides=("${pkgname%-bin}")
+conflicts=("${pkgname%-bin}")
 depends=('electron7' 'bash')
 makedepends=('asar')
 source=("${pkgname%-bin}-${pkgver}.AppImage::${_githuburl}/releases/download/v${pkgver}/Gridea-${pkgver}.AppImage"
@@ -16,7 +17,7 @@ source=("${pkgname%-bin}-${pkgver}.AppImage::${_githuburl}/releases/download/v${
     "${pkgname%-bin}.sh")
 sha256sums=('9538866b640e44e9fd54bc1b3a957d1625648f1c1dd6b942dcd73d22701ede4e'
             'd5fd1669066ffaab84a9063cd2792ded7aca1f6f92a972f58ffb5173404b53d2'
-            '92a2f6e882f85218006619245a814ba8ddc58dbe0121fa9c57d3855acfb4fdc7')
+            '863017a1770322545b623396bd5fcfa47d71621e45ca3861f711b381d10a5328')
 prepare() {
     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 315a38fac70e..6f19c71bd398 100644
--- a/gridea.sh
+++ b/gridea.sh
@@ -1,6 +1,8 @@
 #!/bin/bash
+_ELECTRON=/usr/bin/electron7
+_ASAR="/opt/gridea/gridea.asar"
 if [[ $EUID -ne 0 ]] || [[ $ELECTRON_RUN_AS_NODE ]]; then
-    exec electron7 /opt/gridea/gridea.asar "$@"
+    exec ${_ELECTRON} ${_ASAR} "$@"
 else
-    exec electron7 --no-sandbox /opt/gridea/gridea.asar "$@"
+    exec ${_ELECTRON} ${_ASAR} --no-sandbox "$@"
 fi
\ No newline at end of file