fix errors

3 files changed, 12 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index cca42b7e077e..97e5bf412a8d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,10 +1,10 @@
 pkgbase = geekeditor-bin
 	pkgdesc = Immersive efficiency writing editor.极客编辑器是一款所见即所得(WYSIWYG)富文本沉浸式写作排版编辑器,注重高效创作,可多开文档编辑,同时支持Markdown语法输入及一键排版
 	pkgver = 1.4.9
-	pkgrel = 7
+	pkgrel = 8
 	url = https://www.geekeditor.com/
 	arch = x86_64
-	license = GPL3
+	license = GPL-3.0-only
 	depends = electron11
 	depends = hicolor-icon-theme
 	depends = nodejs
@@ -13,6 +13,6 @@ pkgbase = geekeditor-bin
 	source = geekeditor-1.4.9.deb::https://github.com/geekeditor/geekeditor-releases/releases/download/v1.4.9/geekeditor_1.4.9_amd64.deb
 	source = geekeditor.sh
 	sha256sums = 99c69e953535adffd4edda3932d3f12acb206f104de3dddb15a04b656fda1a1a
-	sha256sums = 5ce46265f0335b03568aa06f7b4c57c5f8ffade7a226489ea39796be91a511bf
+	sha256sums = 0fb7b939a071f4a08476bdd5aa143d2aa8cd335c83309f9919be16cd5c3e2014
 
 pkgname = geekeditor-bin
diff --git a/PKGBUILD b/PKGBUILD
index 77b5bf042efd..79895fba27c9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,12 +3,12 @@ pkgname=geekeditor-bin
 _pkgname=GeekEditor
 pkgver=1.4.9
 _electronversion=11
-pkgrel=7
+pkgrel=8
 pkgdesc="Immersive efficiency writing editor.极客编辑器是一款所见即所得(WYSIWYG)富文本沉浸式写作排版编辑器,注重高效创作,可多开文档编辑,同时支持Markdown语法输入及一键排版"
 arch=('x86_64')
-url=https://www.geekeditor.com/
+url="https://www.geekeditor.com/"
 _ghurl="https://github.com/geekeditor/geekeditor-releases"
-license=('GPL3')
+license=('GPL-3.0-only')
 provides=("${pkgname%-bin}=${pkgver}")
 conflicts=("${pkgname%-bin}")
 depends=(
@@ -21,11 +21,11 @@ source=(
     "${pkgname%-bin}.sh"
 )
 sha256sums=('99c69e953535adffd4edda3932d3f12acb206f104de3dddb15a04b656fda1a1a'
-            '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"
     bsdtar -xf "${srcdir}/data.tar.xz"
     sed "s|/opt/${_pkgname}/${_pkgname}|${pkgname%-bin}|g;s|Icon=${_pkgname}|Icon=${pkgname%-bin}|g;s|Writing Editor|Office|g" \
diff --git a/geekeditor.sh b/geekeditor.sh
index c77c53567639..f9ced1432cfc 100644
--- a/geekeditor.sh
+++ b/geekeditor.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