update to 20230706

3 files changed, 34 insertions, 37 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3ef379a03133..3e526cf7915c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,37 +1,19 @@
 pkgbase = bbg-bin
 	pkgdesc = A static blog generator based on Electron Technology
-	pkgver = 20230505
+	pkgver = 20230706
 	pkgrel = 1
 	url = https://bbg.nekomoe.xyz/
+	arch = aarch64
 	arch = x86_64
 	license = Unlicense
-	depends = libdrm
-	depends = pango
-	depends = libxrandr
-	depends = nss
-	depends = libx11
-	depends = at-spi2-core
-	depends = libxfixes
-	depends = libcups
-	depends = gcc-libs
-	depends = glibc
-	depends = libxcb
-	depends = gtk3
-	depends = dbus
-	depends = libxcomposite
-	depends = nspr
-	depends = alsa-lib
-	depends = libxext
-	depends = cairo
-	depends = hicolor-icon-theme
-	depends = glib2
-	depends = libxdamage
-	depends = libxkbcommon
-	depends = mesa
-	depends = expat
+	depends = electron
+	provides = bbg
 	conflicts = bbg
-	conflicts = bbg-appimage
-	source = bbg-20230505.deb::https://github.com/bbg-contributors/bbg/releases/download/20230505/bbg-20230505-amd64.deb
-	sha256sums = f6dfe8dae1d0369ac6857dcc51917a1a57b1d96ee85c386ac3dd250de4e640c9
+	source = bbg.sh
+	sha256sums = 953e8f37de2337fc082e59818f3a3b8f5574d3ce8b9890ae583fd9c9b9c39541
+	source_aarch64 = bbg-20230706-aarch64.deb::https://github.com/bbg-contributors/bbg/releases/download/20230706/bbg-20230706-arm64.deb
+	sha256sums_aarch64 = 20938ab1f6314c04a04dcf4c2606cd9b781dcf76ce6d127fbf738c721af69a4a
+	source_x86_64 = bbg-20230706-x86_64.deb::https://github.com/bbg-contributors/bbg/releases/download/20230706/bbg-20230706-amd64.deb
+	sha256sums_x86_64 = 77d60dd5c95d8755b1438f77b152c00903e00ac5ef2b05cdbb09b1f7e1ab6f39
 
 pkgname = bbg-bin
diff --git a/PKGBUILD b/PKGBUILD
index cbd1852915c1..a0181de23290 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,18 +1,27 @@
 # Maintainer: zxp19821005 <zxp19821005 at 163 dot com>
 pkgname="bbg-bin"
-pkgver=20230505
+pkgver=20230706
 pkgrel=1
 pkgdesc="A static blog generator based on Electron Technology"
-arch=('x86_64')
+arch=('aarch64' 'x86_64')
 url="https://bbg.nekomoe.xyz/"
 _githuburl="https://github.com/bbg-contributors/bbg"
 license=('Unlicense')
-conflicts=("${pkgname%-bin}" "${pkgname%-bin}-appimage")
-depends=('libdrm' 'pango' 'libxrandr' 'nss' 'libx11' 'at-spi2-core' 'libxfixes' 'libcups' 'gcc-libs' 'glibc' 'libxcb' 'gtk3' 'dbus' \
-    'libxcomposite' 'nspr' 'alsa-lib' 'libxext' 'cairo' 'hicolor-icon-theme' 'glib2' 'libxdamage' 'libxkbcommon' 'mesa' 'expat')
-source=("${pkgname%-bin}-${pkgver}.deb::${_githuburl}/releases/download/${pkgver}/${pkgname%-bin}-${pkgver}-amd64.deb")
-sha256sums=('f6dfe8dae1d0369ac6857dcc51917a1a57b1d96ee85c386ac3dd250de4e640c9')
+provides=("${pkgname%-bin}")
+conflicts=("${pkgname%-bin}")
+depends=('electron')
+source_aarch64=("${pkgname%-bin}-${pkgver}-aarch64.deb::${_githuburl}/releases/download/${pkgver}/${pkgname%-bin}-${pkgver}-arm64.deb")
+source_x86_64=("${pkgname%-bin}-${pkgver}-x86_64.deb::${_githuburl}/releases/download/${pkgver}/${pkgname%-bin}-${pkgver}-amd64.deb")
+source=("${pkgname%-bin}.sh")
+sha256sums=('953e8f37de2337fc082e59818f3a3b8f5574d3ce8b9890ae583fd9c9b9c39541')
+sha256sums_aarch64=('20938ab1f6314c04a04dcf4c2606cd9b781dcf76ce6d127fbf738c721af69a4a')
+sha256sums_x86_64=('77d60dd5c95d8755b1438f77b152c00903e00ac5ef2b05cdbb09b1f7e1ab6f39')
 package() {
-    bsdtar -xf "${srcdir}/data.tar.xz" -C "${pkgdir}"
-    install -Dm644 "${pkgdir}/opt/Baiyuanneko's Blog Generator/LICENSE"* -t "${pkgdir}/usr/share/licenses/${pkgname}"
+    bsdtar -xf "${srcdir}/data.tar.xz"
+    install -Dm755 "${srcdir}/${pkgname%-bin}.sh" "${pkgdir}/opt/${pkgname%-bin}/${pkgname%-bin}"
+    cp -r "${srcdir}/opt/Baiyuanneko's Blog Generator/resources/"* "${pkgdir}/opt/${pkgname%-bin}"
+    install -Dm644 "${srcdir}/opt/Baiyuanneko's Blog Generator/LICENSE"* -t "${pkgdir}/usr/share/licenses/${pkgname}"
+    install -Dm644 "${srcdir}/usr/share/icons/hicolor/0x0/apps/${pkgname%-bin}.png" -t "${pkgdir}/usr/share/pixmaps"
+    sed "s|\"/opt/Baiyuanneko's Blog Generator/bbg\" %U|/opt/${pkgname%-bin}/${pkgname%-bin}|g" -i "${srcdir}/usr/share/applications/${pkgname%-bin}.desktop"
+    install -Dm644 "${srcdir}/usr/share/applications/${pkgname%-bin}.desktop" -t "${pkgdir}/usr/share/applications"
 }
\ No newline at end of file
diff --git a/bbg.sh b/bbg.sh
new file mode 100644
index 000000000000..f259bf410455
--- /dev/null
+++ b/bbg.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+if [[ $EUID -ne 0 ]] || [[ $ELECTRON_RUN_AS_NODE ]]; then
+    exec electron /opt/bbg/app.asar "$@"
+else
+    exec electron --no-sandbox /opt/bbg/app.asar "$@"
+fi
\ No newline at end of file