edit alpm hooks

4 files changed, 14 insertions, 23 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 485b4090c4b4..81fdc5d15d92 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = liteloader-qqnt-git
 	pkgdesc = 轻量, 简洁, 开源的 QQNT 插件加载器
 	pkgver = 1.0.3.r1.ge570e4b
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/LiteLoaderQQNT/LiteLoaderQQNT
 	arch = any
 	license = MIT
@@ -13,10 +13,8 @@ pkgbase = liteloader-qqnt-git
 	source = git+https://github.com/LiteLoaderQQNT/LiteLoaderQQNT.git
 	source = liteloader-qqnt-depatch.hook
 	source = liteloader-qqnt-patch.hook
-	source = liteloader-qqnt-repatch.hook
 	md5sums = SKIP
 	md5sums = 903c2cb02d8d08e34fbc776e4982133b
-	md5sums = c304d0542bd74dbf5d3e12cb9bc82fb8
-	md5sums = b7b6d1579bcdb4f87b97ab5059976387
+	md5sums = 80b6a71e2e34337022bf947324cdcd19
 
 pkgname = liteloader-qqnt-git
diff --git a/PKGBUILD b/PKGBUILD
index 423cec305acd..1e46083c0b16 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 pkgname="liteloader-qqnt-git"
 _pkgname="LiteLoaderQQNT"
 pkgver=1.0.3.r1.ge570e4b
-pkgrel=1
+pkgrel=2
 pkgdesc="轻量, 简洁, 开源的 QQNT 插件加载器"
 arch=('any')
 url="https://github.com/LiteLoaderQQNT/LiteLoaderQQNT"
@@ -14,30 +14,27 @@ provides=("liteloader-qqnt")
 source=(
 	"git+${url}.git"
 	"liteloader-qqnt-depatch.hook"
-	"liteloader-qqnt-patch.hook"
-	"liteloader-qqnt-repatch.hook")
+	"liteloader-qqnt-patch.hook")
 
 md5sums=("SKIP"
 	 "903c2cb02d8d08e34fbc776e4982133b"
-	 "c304d0542bd74dbf5d3e12cb9bc82fb8"
-	 "b7b6d1579bcdb4f87b97ab5059976387")
+	 "80b6a71e2e34337022bf947324cdcd19")
 
-pkgver (){
+pkgver() {
 	cd "${srcdir}/${_pkgname}"
 	git describe --long --tags | sed 's/^v//;s/-/.r/;s/-/./g'
 }
 
-build () {
+build() {
 	cd "${srcdir}/${_pkgname}"
 
 	# Modify LiteLoaderQQNT version code to the GIT version code.
 	TargetVersionCodeLine=$(awk "/version/{print NR}" ./package.json)
 	OrigVersionCode=$(cat ./package.json | grep -o '"version": "[^"]*' | cut -d '"' -f4)
 	sed -i "${TargetLine}s/${OrigVersionCode}/${pkgver}/g" ./package.json
-	# Modify done
 }
 
-package () {
+package() {
 	# prepare to copy files
 	mkdir -p "${pkgdir}/opt/LiteLoader"
 	mkdir -p "${pkgdir}/opt/QQ/resources/app/application"
diff --git a/liteloader-qqnt-patch.hook b/liteloader-qqnt-patch.hook
index 267ee6849eae..53ac080429b7 100644
--- a/liteloader-qqnt-patch.hook
+++ b/liteloader-qqnt-patch.hook
@@ -5,6 +5,12 @@ Operation=Upgrade
 Target=liteloader-qqnt-git
 Target=liteloader-qqnt-bin
 
+[Trigger]
+Type=Path
+Operation=Install
+Operation=Upgrade
+Target=/opt/QQ/resources/app/app_launcher/index.js
+
 [Action]
 Description=Patch QQ for LiteLoaderQQNT
 When=PostTransaction
diff --git a/liteloader-qqnt-repatch.hook b/liteloader-qqnt-repatch.hook
deleted file mode 100644
index 0d55833e2356..000000000000
--- a/liteloader-qqnt-repatch.hook
+++ /dev/null
@@ -1,10 +0,0 @@
-[Trigger]
-Type=File
-Operation=Install
-Operation=Upgrade
-Target=/opt/QQ/resources/app/app_launcher/index.js
-
-[Action]
-Description=Repatch QQ for LiteLoaderQQNT
-When=PostTransaction
-Exec=/bin/sh -c 'grep -q /opt/LiteLoader /opt/QQ/resources/app/app_launcher/index.js || sed -i "1 i require(\"/opt/LiteLoader\");" /opt/QQ/resources/app/app_launcher/index.js'