Update PKGBUILD

2 files changed, 46 insertions, 12 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 743b76db8cc0..5ab27e718d2e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -7,14 +7,28 @@ pkgbase = xbydriver-appimage
 	arch = aarch64
 	license = custom
 	license = Commercial
-	provides = xbydriver-appimage
-	conflicts = xbydriver-appimage
+	provides = xbydriver-bin
+	conflicts = xbydriver-bin
 	replaces = aliyunpan-liupan1890
 	replaces = aliyunpan-odomu
+	noextract = xbydriver-3.11.26-x86_64.deb
+	noextract = xbydriver-3.11.26-aarch64.deb
 	options = !strip
 	source_x86_64 = xbydriver-appimage-3.11.26-x86_64.AppImage::https://github.com/gaozhangmin/aliyunpan/releases/download/v3.11.26/XBYDriver-3.11.26-linux-x86_64.AppImage
+	source_x86_64 = xbydriver-3.11.26-x86_64.deb::https://github.com/gaozhangmin/aliyunpan/releases/download/v3.11.26/XBYDriver-3.11.26-linux-amd64.deb
 	sha256sums_x86_64 = b34c4a17d2e2c05004a96e835dd2cf448739db0bfdeb24afc55ebe20db9befb0
+	sha256sums_x86_64 = 7f2b5da6d68ddcf666fb373989162a3d03fd4cd97d812238eade7db1cf7b980d
 	source_aarch64 = xbydriver-appimage-3.11.26-aarch64.AppImage::https://github.com/gaozhangmin/aliyunpan/releases/download/v3.11.26/XBYDriver-3.11.26-linux-arm64.AppImage
+	source_aarch64 = xbydriver-3.11.26-aarch64.deb::https://github.com/gaozhangmin/aliyunpan/releases/download/v3.11.26/XBYDriver-3.11.26-linux-arm64.deb
 	sha256sums_aarch64 = 9f354e4efdef25f2b0f2ac632d556de49971a2552035068168f6eb68ae1d5b12
+	sha256sums_aarch64 = 41861280452d7c7af00eecdfa43487347a00672444cbfc1c7d2cf0a55b7968b7
+
+pkgname = xbydriver-bin
+	pkgdesc = 阿里云盘小白羊版 v3 修复版 (bin)
+	provides = xbydriver
+	conflicts = xbydriver
 
 pkgname = xbydriver-appimage
+	pkgdesc = 阿里云盘小白羊版 v3 修复版 (AppImage)
+	provides = xbydriver
+	conflicts = xbydriver
diff --git a/PKGBUILD b/PKGBUILD
index 7dc5e1e1846a..d8edec8f042b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: taotieren <admin@taotieren.com>
 
 pkgbase=xbydriver-appimage
-pkgname=xbydriver-appimage
+pkgname=(xbydriver-{bin,appimage})
 pkgver=3.11.26
 pkgrel=0
 pkgdesc="阿里云盘小白羊版 v3 修复版"
@@ -17,22 +17,42 @@ makedepends=()
 backup=()
 options=(!strip)
 install=
-source_x86_64=("${pkgname}-${pkgver}-x86_64.AppImage::${url}/releases/download/v${pkgver}/XBYDriver-${pkgver}-linux-x86_64.AppImage")
-source_aarch64=("${pkgname}-${pkgver}-aarch64.AppImage::${url}/releases/download/v${pkgver}/XBYDriver-${pkgver}-linux-arm64.AppImage")
-sha256sums_x86_64=('b34c4a17d2e2c05004a96e835dd2cf448739db0bfdeb24afc55ebe20db9befb0')
-sha256sums_aarch64=('9f354e4efdef25f2b0f2ac632d556de49971a2552035068168f6eb68ae1d5b12')
-
+source_x86_64=("${pkgbase}-${pkgver}-x86_64.AppImage::${url}/releases/download/v${pkgver}/XBYDriver-${pkgver}-linux-x86_64.AppImage"
+    "${pkgbase%-appimage}-${pkgver}-x86_64.deb::${url}/releases/download/v${pkgver}/XBYDriver-${pkgver}-linux-amd64.deb")
+source_aarch64=("${pkgbase}-${pkgver}-aarch64.AppImage::${url}/releases/download/v${pkgver}/XBYDriver-${pkgver}-linux-arm64.AppImage"
+    "${pkgbase%-appimage}-${pkgver}-aarch64.deb::${url}/releases/download/v${pkgver}/XBYDriver-${pkgver}-linux-arm64.deb")
+sha256sums_x86_64=('b34c4a17d2e2c05004a96e835dd2cf448739db0bfdeb24afc55ebe20db9befb0'
+                   '7f2b5da6d68ddcf666fb373989162a3d03fd4cd97d812238eade7db1cf7b980d')
+sha256sums_aarch64=('9f354e4efdef25f2b0f2ac632d556de49971a2552035068168f6eb68ae1d5b12'
+                    '41861280452d7c7af00eecdfa43487347a00672444cbfc1c7d2cf0a55b7968b7')
+noextract=(
+    ${pkgbase%-appimage}-${pkgver}-x86_64.deb
+    ${pkgbase%-appimage}-${pkgver}-aarch64.deb)
 _install_path="/opt/appimages"
 
 prepare() {
     cd ${srcdir}
-    chmod a+x ${pkgname}-${pkgver}-${CARCH}.AppImage
-    "./${pkgname}-${pkgver}-${CARCH}.AppImage" --appimage-extract > /dev/null
+    chmod a+x ${pkgbase}-${pkgver}-${CARCH}.AppImage
+    "./${pkgbase}-${pkgver}-${CARCH}.AppImage" --appimage-extract > /dev/null
     sed 's|AppRun|/opt/appimages/xbydriver-appimage.AppImage|g' -i "${srcdir}/squashfs-root/xbyyunpan.desktop"
 }
 
-package() {
-    install -Dm755 "${srcdir}"/${pkgname}-${pkgver}-${CARCH}.AppImage "${pkgdir}"/${_install_path}/${pkgname}.AppImage
+package_xbydriver-bin() {
+    pkgdesc+=" (bin)"
+    provides=(${pkgname%-bin})
+    conflicts=(${pkgname%-bin})
+
+    mkdir -pv "${srcdir}"/${pkgbase%-appimage}-${pkgver}-${CARCH}
+    bsdtar -xf "${srcdir}"/${pkgbase%-appimage}-${pkgver}-${CARCH}.deb -C "${srcdir}"/${pkgbase%-appimage}-${pkgver}-${CARCH}
+    bsdtar -xf "${srcdir}"/${pkgbase%-appimage}-${pkgver}-${CARCH}/data.tar.xz --strip-components=1 -C ${pkgdir}/
+}
+
+package_xbydriver-appimage() {
+    pkgdesc+=" (AppImage)"
+    provides=(${pkgname%-appimage})
+    conflicts=(${pkgname%-appimage})
+
+    install -Dm755 "${srcdir}"/${pkgbase}-${pkgver}-${CARCH}.AppImage "${pkgdir}"/${_install_path}/${pkgname}.AppImage
 
     local _icon
     for _icon in 16 32 64 128 256; do