conflicts with the bin version, shrink PKGBUILD

4 files changed, 16 insertions, 19 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2dec96e961ed..76f631426ad4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,15 @@
 pkgbase = liteloader-qqnt-bin
 	pkgdesc = 轻量, 简洁, 开源的 QQNT 插件加载器
 	pkgver = 0.3.1
-	pkgrel = 6
+	pkgrel = 8
 	url = https://github.com/mo-jinran/LiteLoaderQQNT
 	install = liteloader-qqnt-bin.install
 	arch = any
 	license = MIT
 	depends = linuxqq
 	provides = liteloader-qqnt
+	conflicts = linuxqq-appimage
+	conflicts = liteloader-qqnt
 	source = https://github.com/mo-jinran/LiteLoaderQQNT/archive/refs/tags/0.3.1.tar.gz
 	md5sums = SKIP
 
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..b94e76dfca8b
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,5 @@
+
+*.tar.xz
+*.tar.gz
+src/
+pkg/
diff --git a/PKGBUILD b/PKGBUILD
index 454a84d4a407..4027cfaa8b77 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,31 +2,21 @@
 pkgname="liteloader-qqnt-bin"
 _pkgname="LiteLoaderQQNT"
 pkgver=0.3.1
-pkgrel=6
+pkgrel=8
 pkgdesc="轻量, 简洁, 开源的 QQNT 插件加载器"
 arch=('any')
 url="https://github.com/mo-jinran/LiteLoaderQQNT"
 license=('MIT')
 depends=("linuxqq")
+conflicts=("linuxqq-appimage" "liteloader-qqnt")
 provides=("liteloader-qqnt")
 install=${pkgname}.install
-source=("https://github.com/mo-jinran/${_pkgname}/archive/refs/tags/${pkgver}.tar.gz")
+source=("${url}/archive/refs/tags/${pkgver}.tar.gz")
 md5sums=('SKIP')
 
-prepare() {
-	mkdir -p ./${pkgname}
-}
-
-build() {
-	if [ -d ./${pkgname}/${_pkgname}-${pkgver} ]; then
-		rm -r ./${pkgname}/${_pkgname}-${pkgver}
-	fi
-	mv ./${_pkgname}-${pkgver} ./${pkgname}/
-}
-
 package() {
-	mkdir -p "${pkgdir}/usr/lib"
-	cp -a "${pkgname}" "$pkgdir/usr/lib/${pkgname}"
+	mkdir -p "${pkgdir}/opt/QQ/resources/app"
+	mv "${_pkgname}-${pkgver}" "${pkgdir}/opt/QQ/resources/app/LiteLoader"
 
 	echo "======== TIPS ========"
 	echo "If you reinstall/install/upgrade linuxqq after installing this package, "
diff --git a/liteloader-qqnt-bin.install b/liteloader-qqnt-bin.install
index 933deb9ded21..1384cd4558c7 100755
--- a/liteloader-qqnt-bin.install
+++ b/liteloader-qqnt-bin.install
@@ -1,17 +1,17 @@
 post_install() {
-    cp -r /usr/lib/liteloader-qqnt-*/LiteLoaderQQNT-* /opt/QQ/resources/app/LiteLoader
+    #cp -r /usr/lib/liteloader-qqnt-*/LiteLoaderQQNT-* /opt/QQ/resources/app/LiteLoader
     sed -i 's/"main": ".\/app_launcher\/index.js"/"main": "LiteLoader"/g' /opt/QQ/resources/app/package.json
     echo "Install done."
 }
 
 post_upgrade() {
-    cp -r /usr/lib/liteloader-qqnt-*/LiteLoaderQQNT-* /opt/QQ/resources/app/LiteLoader
+    #cp -r /usr/lib/liteloader-qqnt-*/LiteLoaderQQNT-* /opt/QQ/resources/app/LiteLoader
     sed -i 's/"main": ".\/app_launcher\/index.js"/"main": "LiteLoader"/g' /opt/QQ/resources/app/package.json
     echo "Upgrade done."
 }
 
 post_remove() {
-    rm -rf /opt/QQ/resources/app/LiteLoader
+    #rm -rf /opt/QQ/resources/app/LiteLoader
     sed -i 's/"main": "LiteLoader"/"main": ".\/app_launcher\/index.js"/g' /opt/QQ/resources/app/package.json
     echo "Uninstall LLQQNT done."
     echo "If you want delete LLQQNT's data, run 'rm -r ~/Documents/BetterQQNT'"