修改asar路径至pkgname/resources/

3 files changed, 35 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ddb403f66fa3..f996ee59a03c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -5,11 +5,15 @@ pkgbase = postcat-appimage
 	url = https://www.postcat.com/
 	arch = x86_64
 	license = Apache
-	depends = zlib
-	depends = glibc
+	makedepends = asar
+	depends = bash
+	depends = electron22
 	depends = hicolor-icon-theme
-	options = !strip
+	provides = postcat=0.5.1
+	conflicts = postcat
 	source = postcat-0.5.1.AppImage::https://github.com/Postcatlab/postcat/releases/download/v0.5.1/Postcat-0.5.1.AppImage
+	source = postcat.sh
 	sha256sums = 9a1a3928d64df829b151d9aac4a69a4a8a0db6427f478c8af1cead260383e1ae
+	sha256sums = 8e023fcba18f4bc4da169ac0a7c3163005c55d16b260f39f45df6fc087bd7a41
 
 pkgname = postcat-appimage
diff --git a/PKGBUILD b/PKGBUILD
index 6a7d4441156b..93d0d96a1001 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,5 +1,6 @@
-# Maintainer: zxp19821005 <zxp19821005 at 163 dot com>
+# Maintainer: yukiiawa <yukiiawa@foxmail.com>
 pkgname=postcat-appimage
+_pkgname=Postcat
 pkgver=0.5.1
 pkgrel=1
 pkgdesc="Postcat 是一个可扩展的 API 工具平台。集合基础的 API 管理和测试功能，并且可以通过插件简化你的 API 开发工作，让你可以更快更好地创建 API。An extensible API tool."
@@ -7,23 +8,28 @@ arch=('x86_64')
 url="https://www.postcat.com/"
 _githuburl="https://github.com/Postcatlab/postcat"
 license=('Apache')
-options=(!strip)
-conflits=("${pkgname%-appimage}")
-depends=('zlib' 'glibc' 'hicolor-icon-theme')
-source=("${pkgname%-appimage}-${pkgver}.AppImage::${_githuburl}/releases/download/v${pkgver}/Postcat-${pkgver}.AppImage")
-sha256sums=('9a1a3928d64df829b151d9aac4a69a4a8a0db6427f478c8af1cead260383e1ae')
-_install_path="/opt/appimages"
-prepare() {
-    chmod a+x "${pkgname%-appimage}-${pkgver}.AppImage"
-    "./${pkgname%-appimage}-${pkgver}.AppImage" --appimage-extract > /dev/null
-    sed 's|AppRun|/opt/appimages/postcat.AppImage|g' -i "${srcdir}/squashfs-root/${pkgname%-appimage}.desktop"
+provides=("${pkgname%-appimage}=${pkgver}")
+conflicts=("${pkgname%-appimage}")
+depends=('bash' 'electron22' 'hicolor-icon-theme')
+makedepends=('asar')
+source=("${pkgname%-appimage}-${pkgver}.AppImage::${_githuburl}/releases/download/v${pkgver}/${_pkgname}-${pkgver}.AppImage"
+    "${pkgname%-appimage}.sh")
+sha256sums=('9a1a3928d64df829b151d9aac4a69a4a8a0db6427f478c8af1cead260383e1ae'
+            '8e023fcba18f4bc4da169ac0a7c3163005c55d16b260f39f45df6fc087bd7a41')
+build() {
+    chmod a+x "${srcdir}/${pkgname%-appimage}-${pkgver}.AppImage"
+    "${srcdir}/${pkgname%-appimage}-${pkgver}.AppImage" --appimage-extract > /dev/null
+    asar e "${srcdir}/squashfs-root/resources/app.asar" "${srcdir}/app.asar.unpacked"
+    cp -r "${srcdir}/squashfs-root/resources/app.asar.unpacked" "${srcdir}"
+    asar p "${srcdir}/app.asar.unpacked" "${srcdir}/app.asar"
+    sed "s|AppRun --no-sandbox %U|${pkgname%-appimage}|g" -i "${srcdir}/squashfs-root/${pkgname%-appimage}.desktop"
 }
-    
 package() {
-    install -Dm755 "${srcdir}/${pkgname%-appimage}-${pkgver}.AppImage" "${pkgdir}/${_install_path}/${pkgname%-appimage}.AppImage"
+    install -Dm755 "${srcdir}/${pkgname%-appimage}.sh" "${pkgdir}/usr/bin/${pkgname%-appimage}"
+    install -Dm644 "${srcdir}/app.asar" -t "${pkgdir}/opt/${pkgname%-appimage}/resources"
     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%-appimage}.png" \
             -t "${pkgdir}/usr/share/icons/hicolor/${_icons}/apps"
     done
     install -Dm644 "${srcdir}/squashfs-root/${pkgname%-appimage}.desktop" -t "${pkgdir}/usr/share/applications"
-}
\ No newline at end of file
+}
diff --git a/postcat.sh b/postcat.sh
new file mode 100644
index 000000000000..f1f61ce50125
--- /dev/null
+++ b/postcat.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+_ELECTRON=/usr/bin/electron22
+_ASAR="/opt/postcat/resources/app.asar"
+if [[ $EUID -ne 0 ]] || [[ $ELECTRON_RUN_AS_NODE ]]; then
+    exec ${_ELECTRON} ${_ASAR} "$@"
+else
+    exec ${_ELECTRON} ${_ASAR} --no-sandbox "$@"
+fi