update to version v1.x.x

4 files changed, 22 insertions, 52 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 19d6a7caf67c..fe11979e7be2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = liteloader-qqnt-git
 	pkgdesc = 轻量, 简洁, 开源的 QQNT 插件加载器
-	pkgver = 0.5.3.r2.g8076827
+	pkgver = 1.0.2.r0.gf621aee
 	pkgrel = 1
 	url = https://github.com/LiteLoaderQQNT/LiteLoaderQQNT
 	arch = any
@@ -14,7 +14,7 @@ pkgbase = liteloader-qqnt-git
 	source = liteloader-qqnt-depatch.hook
 	source = liteloader-qqnt-patch.hook
 	md5sums = SKIP
-	md5sums = 00854a75b74467a0b496b3f214cc5d43
-	md5sums = 1f0109321d95c7002d3c4668f4679a9c
+	md5sums = SKIP
+	md5sums = SKIP
 
 pkgname = liteloader-qqnt-git
diff --git a/PKGBUILD b/PKGBUILD
index 8f5453584963..d56e2a32635f 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
-# Maintainers: kobe-koto <admin[at]koto.cc>, Ketal_Q_ray<k@ketal.icu>
+# Maintainers: kobe-koto <admin[at]koto.cc>, Ketal_Q_ray <k[at]ketal.icu>
 pkgname="liteloader-qqnt-git"
 _pkgname="LiteLoaderQQNT"
-pkgver=0.5.3.r2.g8076827
+pkgver=1.0.2.r0.gf621aee
 pkgrel=1
 pkgdesc="轻量, 简洁, 开源的 QQNT 插件加载器"
 arch=('any')
@@ -17,41 +17,18 @@ source=(
 	"liteloader-qqnt-patch.hook"
 )
 md5sums=('SKIP'
-         '00854a75b74467a0b496b3f214cc5d43'
-         '1f0109321d95c7002d3c4668f4679a9c')
+         'SKIP'
+         'SKIP')
 
 pkgver (){
 	cd "${srcdir}/${_pkgname}"
 	git describe --long --tags | sed 's/^v//;s/-/.r/;s/-/./g'
 }
 
-prepare () {
-	cd "${srcdir}/${_pkgname}"
-	
-	echo "Pulling submodules"
-	git submodule update --init --recursive -f
-}
-
 build () {
 	cd "${srcdir}/${_pkgname}"
 
-	echo "Install node dependencies for builtin modules using NPM"
-	cd builtins
-	Builtins=$(ls)
-	for i in ${Builtins[@]}
-	do
-		if [ -f ./${i}/package.json ]; then
-			echo "Installing node dependencies for ${i}..."
-			cd "${i}"
-                	npm install
-			cd ..
-			echo "NPM Install for ${i} done."
-	        fi
-	done
-	cd ..
-	echo "Install node dependeccies done."
-
-	# Modify LiteLoaderQQNT version code that ref to git version code.
+	# 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
@@ -59,29 +36,22 @@ build () {
 }
 
 package () {
-	cd "${srcdir}"
-
-	# copy LiteLoaderQQNT to target path
-	mkdir -p "${pkgdir}/opt/QQ/resources/app/"
-	cp -a "${_pkgname}" "${pkgdir}/opt/QQ/resources/app/LiteLoader"
+	# prepare to copy files
+	mkdir -p "${pkgdir}/opt/LiteLoader"
+	mkdir -p "${pkgdir}/opt/QQ/resources/app/application"
 
-	# cleaning up any .git dir from final package.
-	cd "${pkgdir}/opt/QQ/resources/app/LiteLoader/"
+	# copy files
+	cp -rf "${_pkgname}"/* "${pkgdir}/opt/LiteLoader"
+	cp -f "${_pkgname}/src/preload.js" "${pkgdir}/opt/QQ/resources/app/application/preload.js"
 
-	ls
+	# modify premissions
+	chmod -R 0777 "${pkgdir}/opt/LiteLoader"
 
-	rm -rf ./.git
-
-	Builtins=$(ls ./builtins)
-	for i in ${Builtins[@]}
-	do
-		rm -rf ./builtins/${i}/.git
-	done
-
-	cd "${srcdir}"
-	# cleaning up done.
+	# clean up
+	# - remove .git/
+	rm -rf "${pkgdir}/opt/QQ/resources/app/LiteLoader/.git"
 
 	# install hooks
-	install -Dm644 "${srcdir}/liteloader-qqnt-depatch.hook" "${pkgdir}/etc/pacman.d/hooks/liteloader-qqnt-depatch.hook"
 	install -Dm644 "${srcdir}/liteloader-qqnt-patch.hook" "${pkgdir}/etc/pacman.d/hooks/liteloader-qqnt-patch.hook"
+	install -Dm644 "${srcdir}/liteloader-qqnt-depatch.hook" "${pkgdir}/etc/pacman.d/hooks/liteloader-qqnt-depatch.hook"
 }
diff --git a/liteloader-qqnt-depatch.hook b/liteloader-qqnt-depatch.hook
index 02dcb511dab9..f3f0d4d5c567 100644
--- a/liteloader-qqnt-depatch.hook
+++ b/liteloader-qqnt-depatch.hook
@@ -7,4 +7,4 @@ Target=liteloader-qqnt-bin
 [Action]
 Description=Depatch QQ for LiteLoaderQQNT
 When=PreTransaction
-Exec=/bin/sh -c 'TargetLine=$(awk "/main/{print NR}" /opt/QQ/resources/app/package.json); sed -i "${TargetLine}s/LiteLoader/.\/app_launcher\/index.js/g" /opt/QQ/resources/app/package.json; echo "Uninstall LLQQNT done."'
+Exec=sh -c "grep -q /opt/LiteLoader /opt/QQ/resources/app/app_launcher/index.js && sed -i '1d' /opt/QQ/resources/app/app_launcher/index.js"
diff --git a/liteloader-qqnt-patch.hook b/liteloader-qqnt-patch.hook
index 5db5face50cc..aade1e725a94 100644
--- a/liteloader-qqnt-patch.hook
+++ b/liteloader-qqnt-patch.hook
@@ -10,4 +10,4 @@ Target=linuxqq-nt-bwrap
 [Action]
 Description=Repatch QQ for LiteLoaderQQNT
 When=PostTransaction
-Exec=/bin/sh -c 'TargetLine=$(awk "/main/{print NR}" /opt/QQ/resources/app/package.json); sed -i "${TargetLine}s/.\/app_launcher\/index.js/LiteLoader/g" /opt/QQ/resources/app/package.json'
+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'