Bump version to 20220315

5 files changed, 30 insertions, 31 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f2dd0ac4cd3e..c4154cabce32 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,21 +1,19 @@
 pkgbase = bbg
 	pkgdesc = A static blog generator built with electron
-	pkgver = 20220304
+	pkgver = 20220315
 	pkgrel = 1
 	url = https://github.com/baiyang-lzy/bbg
 	arch = any
 	license = Unlicense
-	depends = gtk3
-	depends = libxcb
 	depends = electron
 	conflicts = bbg-git
-	source = bbg
+	source = bbg.sh
 	source = icon.png
 	source = bbg.desktop
-	source = app.asar::https://github.com/baiyang-lzy/bbg/releases/download/20220304/app.asar
-	sha256sums = 9bb48fe10ec7b1b669546d185a98976b822b50fbcbaf0dd5faf0c162e8346a21
+	source = app-20220315.asar::https://github.com/baiyang-lzy/bbg/releases/download/20220315/app.asar
+	sha256sums = 90eae5e0d3e5e89cf3a54c25ed6b8f94e9881b0b37c94e4592661137ba859c2e
 	sha256sums = b2055c02386eacb33fff9f53b2c1bf099d49e4c63d016704a220e9108ded262f
-	sha256sums = d57c7e1126b2b168f2dd6debd2e77f069379c244b0ed7393eebffc2f2aa0d8be
-	sha256sums = cc2636f9288ab1e44a12bbf386d34d5c1a56221943394dd9ae076facfadc8ab9
+	sha256sums = f503d93639c1f4d4e050eceb11adf64d369908e5941cfdbda3af30b2f3c73d96
+	sha256sums = ce9c8bdd36e174e4fb5fcd85daf0c8bc7910e93300979688e4e47b72c6b2bb50
 
 pkgname = bbg
diff --git a/PKGBUILD b/PKGBUILD
index 97e8cdf9ffed..e5fa94024f1a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,32 +1,35 @@
-# Maintainer: zzjzxq33 <wojiushixxx at 126 dot com>
-# Co-Maintainer: Misaka13514 <Misaka13514 at gmail dot com>
+# Maintainer:       zzjzxq33 <wojiushixxx at 126 dot com>
+# Co-Maintainer:    Misaka13514 <Misaka13514 at gmail dot com>
 pkgname=bbg
-pkgver=20220304
+pkgver=20220315
 pkgrel=1
 pkgdesc="A static blog generator built with electron"
 arch=('any')
 url="https://github.com/baiyang-lzy/bbg"
 license=('Unlicense')
-depends=('gtk3' 'libxcb' 'electron')
-conflicts=('bbg-git')
+depends=('electron')
+conflicts=("${pkgname}-git")
 source=(
-	"bbg"
-	"icon.png"
-	"bbg.desktop"
-	"app.asar"::"${url}/releases/download/${pkgver}/app.asar"
+	'bbg.sh'
+	'icon.png'
+	'bbg.desktop'
+	"app-${pkgver}.asar"::"${url}/releases/download/${pkgver}/app.asar"
 )
 sha256sums=(
-	'9bb48fe10ec7b1b669546d185a98976b822b50fbcbaf0dd5faf0c162e8346a21'
+	'90eae5e0d3e5e89cf3a54c25ed6b8f94e9881b0b37c94e4592661137ba859c2e'
 	'b2055c02386eacb33fff9f53b2c1bf099d49e4c63d016704a220e9108ded262f'
-	'd57c7e1126b2b168f2dd6debd2e77f069379c244b0ed7393eebffc2f2aa0d8be'
-	'cc2636f9288ab1e44a12bbf386d34d5c1a56221943394dd9ae076facfadc8ab9'
+	'f503d93639c1f4d4e050eceb11adf64d369908e5941cfdbda3af30b2f3c73d96'
+	'ce9c8bdd36e174e4fb5fcd85daf0c8bc7910e93300979688e4e47b72c6b2bb50'
 )
 
 package() {
-	cd ${srcdir}/
-	install -dm755 ${pkgdir}/usr/lib/${pkgname}
-	install -Dm644 app.asar     ${pkgdir}/usr/lib/${pkgname}/app.asar
-	install -Dm755 bbg          ${pkgdir}/usr/bin/${pkgname}
-	install -Dm644 bbg.desktop  ${pkgdir}/usr/share/applications/${pkgname}.desktop
-	install -Dm644 icon.png     ${pkgdir}/usr/share/icons/${pkgname}.png
+	cd "$srcdir"
+	install -dm755 "${pkgdir}/usr/share/${pkgname}"
+	install -Dm755 "bbg.sh"             "${pkgdir}/usr/bin/${pkgname}"
+	install -Dm644 "app-${pkgver}.asar" "${pkgdir}/usr/share/${pkgname}/app.asar"
+	install -Dm644 "bbg.desktop"        "${pkgdir}/usr/share/applications/${pkgname}.desktop"
+	install -Dm644 "icon.png"           "${pkgdir}/usr/share/icons/${pkgname}.png"
+
+	# install bbgvertype: https://github.com/baiyang-lzy/bbg/blob/f3d61ce4d79680329bad4cb014c909fb86037f38/App/start.js
+	echo "aur-bbg-zzjzxq33-misaka13514" | install -Dm644 /dev/stdin "${pkgdir}/usr/share/bbg/bbgvertype"
 }
diff --git a/bbg b/bbg
deleted file mode 100755
index 8ce32e74d4ee..000000000000
--- a/bbg
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-export ELECTRON_IS_DEV=0
-exec /usr/bin/electron /usr/lib/bbg/app.asar
-
diff --git a/bbg.desktop b/bbg.desktop
index 1a4d049f4376..7ce8a37a50fa 100644
--- a/bbg.desktop
+++ b/bbg.desktop
@@ -9,4 +9,3 @@ Icon=/usr/share/icons/bbg.png
 Type=Application
 StartupNotify=false
 Categories=Office
-
diff --git a/bbg.sh b/bbg.sh
new file mode 100755
index 000000000000..a37e040f0d85
--- /dev/null
+++ b/bbg.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exec electron /usr/share/bbg/app.asar "$@"