fix errors

3 files changed, 33 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3d5abb88f7a4..ba0d368c814d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = gridea-bin
 	pkgdesc = A static blog writing client.静态博客写作客户端
 	pkgver = 0.9.3
-	pkgrel = 5
+	pkgrel = 6
 	url = https://gridea.dev
 	arch = x86_64
 	license = MIT
@@ -15,11 +15,12 @@ pkgbase = gridea-bin
 	depends = dbus-glib
 	provides = gridea=0.9.3
 	conflicts = gridea
+	options = !emptydirs
 	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/v0.9.3/LICENSE
+	source = LICENSE-0.9.3::https://raw.githubusercontent.com/getgridea/gridea/v0.9.3/LICENSE
 	source = gridea.sh
 	sha256sums = 9538866b640e44e9fd54bc1b3a957d1625648f1c1dd6b942dcd73d22701ede4e
 	sha256sums = d5fd1669066ffaab84a9063cd2792ded7aca1f6f92a972f58ffb5173404b53d2
-	sha256sums = 8d425e6d058d105def17629df226b070b5d54b7d085e9f5a13b7adf683fae7b2
+	sha256sums = 5ce46265f0335b03568aa06f7b4c57c5f8ffade7a226489ea39796be91a511bf
 
 pkgname = gridea-bin
diff --git a/PKGBUILD b/PKGBUILD
index 8e5491bed93a..602562ae266a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,40 +3,45 @@
 pkgname=gridea-bin
 _pkgname=Gridea
 pkgver=0.9.3
-pkgrel=5
+_electronversion=7
+pkgrel=6
 pkgdesc="A static blog writing client.静态博客写作客户端"
 arch=('x86_64')
 url='https://gridea.dev'
-_githuburl="https://github.com/getgridea/gridea"
+_ghurl="https://github.com/getgridea/gridea"
 license=('MIT')
 provides=("${pkgname%-bin}=${pkgver}")
 conflicts=("${pkgname%-bin}")
 depends=(
-    'electron7'
+    "electron${_electronversion}"
     'libx11'
     'gdk-pixbuf2'
     'libxext'
     'libdbusmenu-glib'
     'gtk2'
     'dbus-glib'
-
 )
 makedepends=(
     'squashfuse'
 )
+options=('!emptydirs')
 source=(
-    "${pkgname%-bin}-${pkgver}.AppImage::${_githuburl}/releases/download/v${pkgver}/${_pkgname}-${pkgver}.AppImage"
-    "LICENSE::https://raw.githubusercontent.com/getgridea/gridea/v${pkgver}/LICENSE"
+    "${pkgname%-bin}-${pkgver}.AppImage::${_ghurl}/releases/download/v${pkgver}/${_pkgname}-${pkgver}.AppImage"
+    "LICENSE-${pkgver}::https://raw.githubusercontent.com/getgridea/gridea/v${pkgver}/LICENSE"
     "${pkgname%-bin}.sh"
 )
 sha256sums=('9538866b640e44e9fd54bc1b3a957d1625648f1c1dd6b942dcd73d22701ede4e'
             'd5fd1669066ffaab84a9063cd2792ded7aca1f6f92a972f58ffb5173404b53d2'
-            '8d425e6d058d105def17629df226b070b5d54b7d085e9f5a13b7adf683fae7b2')
+            '5ce46265f0335b03568aa06f7b4c57c5f8ffade7a226489ea39796be91a511bf')
 build() {
+    sed -e "s|@electronversion@|${_electronversion}|g" \
+        -e "s|@appname@|${pkgname%-bin}|g" \
+        -e "s|@appasar@|app|g" \
+        -i "${srcdir}/${pkgname%-bin}.sh"
     chmod a+x "${srcdir}/${pkgname%-bin}-${pkgver}.AppImage"
     "${srcdir}/${pkgname%-bin}-${pkgver}.AppImage" --appimage-extract > /dev/null
-    asar pack "${srcdir}/squashfs-root/resources/app" "${srcdir}/${pkgname%-bin}.asar"
-    sed "s|AppRun|${pkgname%-bin}|g" -i "${srcdir}/squashfs-root/${pkgname%-bin}.desktop"
+    sed "s|AppRun|${pkgname%-bin} %U|g" -i "${srcdir}/squashfs-root/${pkgname%-bin}.desktop"
+    find "${srcdir}/squashfs-root/resources" -type d -exec chmod 755 {} \;
 }
 package() {
     install -Dm755 "${srcdir}/${pkgname%-bin}.sh" "${pkgdir}/usr/bin/${pkgname%-bin}"
@@ -45,5 +50,5 @@ package() {
     cp -r "${srcdir}/squashfs-root/resources/app" "${pkgdir}/usr/lib/${pkgname%-bin}"
     install -Dm644 "${srcdir}/squashfs-root/${pkgname%-bin}.desktop" -t "${pkgdir}/usr/share/applications"
     install -Dm644 "${srcdir}/squashfs-root/usr/share/icons/hicolor/0x0/apps/${pkgname%-bin}.png" -t "${pkgdir}/usr/share/pixmaps"
-    install -Dm644 "${srcdir}/LICENSE" -t "${pkgdir}/usr/share/licenses/${pkgname}"
+    install -Dm644 "${srcdir}/LICENSE-${pkgver}" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
\ No newline at end of file
diff --git a/gridea.sh b/gridea.sh
index bf56dcfeb2ee..c77c53567639 100644
--- a/gridea.sh
+++ b/gridea.sh
@@ -1,11 +1,17 @@
-#!/bin/bash
-_ELECTRON=/usr/bin/electron7
-APPDIR="/usr/lib/gridea"
-export PATH="${APPDIR}:${PATH}"
-export LD_LIBRARY_PATH="${APPDIR}/swiftshader:${APPDIR}/lib:${LD_LIBRARY_PATH}"
-_ASAR="${APPDIR}/app"
+#!/bin/sh
+set -e
+_APPDIR="/usr/lib/@appname@"
+_ASAR="${_APPDIR}/@appasar@"
+export PATH="${_APPDIR}:${PATH}"
+export LD_LIBRARY_PATH="${_APPDIR}/swiftshader:${_APPDIR}/lib:${LD_LIBRARY_PATH}"
+export ELECTRON_IS_DEV=0
+export NODE_ENV=production
 if [[ $EUID -ne 0 ]] || [[ $ELECTRON_RUN_AS_NODE ]]; then
-    exec ${_ELECTRON} ${_ASAR} "$@"
+    cd "${_APPDIR}"
+    exec electron@electronversion@ "${_ASAR}" "$@"
+    exit
 else
-    exec ${_ELECTRON} ${_ASAR} --no-sandbox "$@"
+    cd "${_APPDIR}"
+    exec electron@electronversion@ "${_ASAR}" --no-sandbox "$@"
+    exit
 fi
\ No newline at end of file