fix errors

3 files changed, 36 insertions, 11 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2a5346299f26..4e6f8525a777 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,19 @@
 pkgbase = moyu-bin
 	pkgdesc = 基于 Vue 和 Electron 的在线协同api接口管理工具。接口文档管理工具、接口工具、接口文档、api文档、api工具、快乐摸鱼
 	pkgver = 0.8.0_beta
-	pkgrel = 2
+	pkgrel = 3
 	url = https://online.jobtool.cn/
 	arch = x86_64
 	license = MIT
-	depends = bash
+	makedepends = squashfuse
 	depends = electron16
 	depends = hicolor-icon-theme
+	depends = libx11
+	depends = gdk-pixbuf2
+	depends = libxext
+	depends = libdbusmenu-glib
+	depends = gtk2
+	depends = dbus-glib
 	provides = moyu=0.8.0_beta
 	conflicts = moyu
 	source = moyu-0.8.0_beta.AppImage::https://github.com/trueleaf/moyu/releases/download/0.8.0-beta/moyu-0.8.0.AppImage
@@ -15,6 +21,6 @@ pkgbase = moyu-bin
 	source = moyu.sh
 	sha256sums = 0dab0db5b1492b06f52104dcc4ebe7acce3817fb8b6abb3d9523bff69a2dcb19
 	sha256sums = bbef3f01685fbef2be49493df601daf55815b3a044fb7361e160c9074ea515f7
-	sha256sums = 016c6506b20553da9952cb17fc37f989f8b61b93a3d348b14b8ca66109e11b26
+	sha256sums = 10364ba00c3519a48c8eafe4b6b875f9496ffbba3068f7042b1be603e84717c5
 
 pkgname = moyu-bin
diff --git a/PKGBUILD b/PKGBUILD
index f54aaa81b673..43dffe120506 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: zxp19821005 <zxp19821005 at 163 dot com>
 pkgname=moyu-bin
 pkgver=0.8.0_beta
-pkgrel=2
+pkgrel=3
 pkgdesc="基于 Vue 和 Electron 的在线协同api接口管理工具。接口文档管理工具、接口工具、接口文档、api文档、api工具、快乐摸鱼"
 arch=('x86_64')
 url="https://online.jobtool.cn/"
@@ -9,21 +9,37 @@ _githuburl="https://github.com/trueleaf/moyu"
 license=('MIT')
 provides=("${pkgname%-bin}=${pkgver}")
 conflicts=("${pkgname%-bin}")
-depends=('bash' 'electron16' 'hicolor-icon-theme')
-source=("${pkgname%-bin}-${pkgver}.AppImage::${_githuburl}/releases/download/${pkgver//_/-}/${pkgname%-bin}-${pkgver%_beta}.AppImage"
+depends=(
+    'electron16'
+    'hicolor-icon-theme'
+    'libx11'
+    'gdk-pixbuf2'
+    'libxext'
+    'libdbusmenu-glib'
+    'gtk2'
+    'dbus-glib'
+)
+makedepends=(
+    'squashfuse'
+)
+source=(
+    "${pkgname%-bin}-${pkgver}.AppImage::${_githuburl}/releases/download/${pkgver//_/-}/${pkgname%-bin}-${pkgver%_beta}.AppImage"
     "LICENSE::https://raw.githubusercontent.com/trueleaf/moyu/${pkgver//_/-}/LICENSE"
-    "${pkgname%-bin}.sh")
+    "${pkgname%-bin}.sh"
+)
 sha256sums=('0dab0db5b1492b06f52104dcc4ebe7acce3817fb8b6abb3d9523bff69a2dcb19'
             'bbef3f01685fbef2be49493df601daf55815b3a044fb7361e160c9074ea515f7'
-            '016c6506b20553da9952cb17fc37f989f8b61b93a3d348b14b8ca66109e11b26')
-prepare() {
+            '10364ba00c3519a48c8eafe4b6b875f9496ffbba3068f7042b1be603e84717c5')
+build() {
     chmod a+x "${srcdir}/${pkgname%-bin}-${pkgver}.AppImage"
     "${srcdir}/${pkgname%-bin}-${pkgver}.AppImage" --appimage-extract > /dev/null
     sed "s|AppRun --no-sandbox %U|${pkgname%-bin}|g" -i "${srcdir}/squashfs-root/${pkgname%-bin}.desktop"
 }
 package() {
     install -Dm755 "${srcdir}/${pkgname%-bin}.sh" "${pkgdir}/usr/bin/${pkgname%-bin}"
-    install -Dm644 "${srcdir}/squashfs-root/resources/app.asar" -t "${pkgdir}/opt/${pkgname%-bin}"
+    install -Dm644 "${srcdir}/squashfs-root/resources/app.asar" -t "${pkgdir}/usr/lib/${pkgname%-bin}"
+    install -Dm644 "${srcdir}/squashfs-root/swiftshader/"* -t "${pkgdir}/usr/lib/${pkgname%-bin}/swiftshader"
+    install -Dm644 "${srcdir}/squashfs-root/usr/lib/"* -t "${pkgdir}/usr/lib/${pkgname%-bin}/lib"
     install -Dm644 "${srcdir}/squashfs-root/${pkgname%-bin}.desktop" -t "${pkgdir}/usr/share/applications"
     for _icons in 16x16 24x24 32x32 48x48 64x64 128x128 256x256 512x512 1024x1024;do
         install -Dm644 "${srcdir}/squashfs-root/usr/share/icons/hicolor/${_icons}/apps/${pkgname%-bin}.png" \
diff --git a/moyu.sh b/moyu.sh
index 79d995340b7d..ebe608debf63 100644
--- a/moyu.sh
+++ b/moyu.sh
@@ -1,6 +1,9 @@
 #!/bin/bash
 _ELECTRON=/usr/bin/electron16
-_ASAR="/opt/moyu/app.asar"
+APPDIR=/usr/lib/moyu
+export PATH="${APPDIR}:${PATH}"
+export LD_LIBRARY_PATH="${APPDIR}/swiftshader:${APPDIR}/lib:${LD_LIBRARY_PATH}"
+_ASAR="${APPDIR}/app.asar"
 if [[ $EUID -ne 0 ]] || [[ $ELECTRON_RUN_AS_NODE ]]; then
     exec ${_ELECTRON} ${_ASAR} "$@"
 else