some improve

3 files changed, 48 insertions, 12 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3ac9c3c3df64..66baf2a241c7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -8,13 +8,16 @@ pkgbase = openwebmonitor3
 	license = proprietary
 	makedepends = asar
 	makedepends = npm
-	makedepends = gendesk
 	depends = electron11
-	options = !strip
+	depends = glibc
+	depends = gcc-libs
+	depends = bash
 	source = http://owm.fatecore.com/download/OpenWebMonitor3-3.5.2.zip
 	source = patch
+	source = openwebmonitor3.desktop
 	sha256sums = f788d367c73e5f287405452bce6b8d8b1f263e76fd4ff76a8c8b42e8e6e8f8a4
 	sha256sums = dd6f93c153dc09ba60dae10bb3a16912c69469c9715231310ade3b85977fab03
+	sha256sums = 91044ca6e7e70b8ff72f4cb758d5e82395f6e4fda957020f27a7eaa75c4c7cf7
 	source_x86_64 = https://github.com/TryGhost/node-sqlite3/releases/download/v5.1.6/napi-v6-linux-glibc-x64.tar.gz
 	sha256sums_x86_64 = d31475a48731bda50747d4187f46f028565e84086473b55e165e9e4447430164
 	source_aarch64 = https://github.com/TryGhost/node-sqlite3/releases/download/v5.1.6/napi-v6-linux-glibc-arm64.tar.gz
diff --git a/PKGBUILD b/PKGBUILD
index bdc2a80b9f73..9f0ef9a7c6c9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,19 +6,20 @@ pkgdesc="通用型网页内容监控工具"
 arch=(x86_64 aarch64)
 url="http://owm.fatecore.com/"
 license=('proprietary')
-depends=(electron11)
-makedepends=(asar npm gendesk)
-options=(!strip)
+depends=(electron11 glibc gcc-libs bash)
+makedepends=(asar npm)
 source=("http://owm.fatecore.com/download/OpenWebMonitor3-3.5.2.zip"
-        "patch")
+	"patch"
+	$pkgname.desktop)
 source_x86_64=(
 	"https://github.com/TryGhost/node-sqlite3/releases/download/v5.1.6/napi-v6-linux-glibc-x64.tar.gz"
-	)
+)
 source_aarch64=(
-"https://github.com/TryGhost/node-sqlite3/releases/download/v5.1.6/napi-v6-linux-glibc-arm64.tar.gz"
+	"https://github.com/TryGhost/node-sqlite3/releases/download/v5.1.6/napi-v6-linux-glibc-arm64.tar.gz"
 )
 sha256sums=('f788d367c73e5f287405452bce6b8d8b1f263e76fd4ff76a8c8b42e8e6e8f8a4'
-            'dd6f93c153dc09ba60dae10bb3a16912c69469c9715231310ade3b85977fab03')
+            'dd6f93c153dc09ba60dae10bb3a16912c69469c9715231310ade3b85977fab03'
+            '91044ca6e7e70b8ff72f4cb758d5e82395f6e4fda957020f27a7eaa75c4c7cf7')
 sha256sums_x86_64=('d31475a48731bda50747d4187f46f028565e84086473b55e165e9e4447430164')
 sha256sums_aarch64=('4cfa941ac72e76eac65bb1e6e4668fd5c94c2179c8680c4a445f77644e819d08')
 
@@ -29,19 +30,41 @@ prepare() {
 	asar e app.asar ./app
 	pushd app
 	npm i sqlite3@5.0.2
-	patch -p1 < $srcdir/patch
+	patch -p1 <$srcdir/patch
 	pushd node_modules
 	rm -rf node-gyp sqlite3/tools
 	pushd sqlite3/lib/binding/
 	cp -av $srcdir/napi-v* ./
 	mv napi-v6-linux-*-x64 napi-v6-linux-x64
+	find $srcdir \( \
+		-name "Dockerfile" \
+		-or -name "*.h" \
+		-or -name "*.ts" \
+		-or -name "package-lock.json" \
+		-or -name "*.cc" \
+		-or -name "cli.js" \
+		-or -name "*.py" \
+		-or -name "build.js" \
+		\) -type f -delete
+	find $srcdir \( \
+		-path "*/bin/*" \
+		-or -path "*/test/*" \
+		-or -path "*/example/*" \
+		-or -path "*/examples/*" \
+		-or -path "*/.bin/*" \
+		\) \( -type f -or -type l \) -delete
+	find $srcdir -name "*.1" -path "*/man/*" -type f -delete
+	find $srcdir \( -name "package-lock.json" -or -name "Makefile" \) -delete
+	find $srcdir -type d -empty -delete
+
 }
 
 package() {
 	install -d $pkgdir/opt/$pkgname/
 	cp -av $srcdir/resources/app $pkgdir/opt/$pkgname/
-	echo "#!/bin/sh\nelectron11 /opt/$pkgname/app" | install -Dm755 /dev/stdin $pkgdir/usr/bin/$pkgname
+	printf "#!/bin/sh
+exec electron11 /opt/$pkgname/app \"\$@\"
+" | install -Dm755 /dev/stdin $pkgdir/usr/bin/$pkgname
 	find $pkgdir -name "icon.png" -type f -exec install -Dm644 {} $pkgdir/usr/share/pixmaps/$pkgname.png \;
-	gendesk --pkgname $pkgname --pkgdesc $pkgdesc
 	install -Dm644 $pkgname.desktop -t $pkgdir/usr/share/applications/
 }
diff --git a/openwebmonitor3.desktop b/openwebmonitor3.desktop
new file mode 100644
index 000000000000..27f3a2addba9
--- /dev/null
+++ b/openwebmonitor3.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Version=1.0
+Type=Application
+Name=Openwebmonitor3
+Comment=通用型网页内容监控工具
+Exec=openwebmonitor3
+Icon=openwebmonitor3
+Terminal=false
+StartupNotify=false
+Categories=Application;