Update 7.1021

2 files changed, 28 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 17601365c46c..9ac77be116ca 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = xdroid-bin
 	pkgdesc = 卓懿,让安卓应用融入Linux平台应用生态体系，卓懿 x86_64 版（个人免费下载使用，不得用于商业用途）。
-	pkgver = 7.1002
+	pkgver = 7.1021
 	pkgrel = 1
 	url = https://www.linzhuotech.com/Product/download
 	arch = x86_64
@@ -8,9 +8,9 @@ pkgbase = xdroid-bin
 	depends = dkms
 	depends = xdg-utils
 	provides = xDroidInstall
-	noextract = xdroid-bin-7.1002.tar.gz
+	noextract = xdroid-bin-7.1021.tar.gz
 	options = !strip
-	source = xdroid-bin-7.1002.tar.gz::https://d3.injdk.cn/xDroid/xDroidInstall-x86_64-v7.1002-20210820092942.tar.gz
-	sha256sums = 771ae4b8cacb7bd2d6952665832257e2e16fcbff613f03727597508dd25d7920
+	source = xdroid-bin-7.1021.tar.gz::https://d6.injdk.cn/xdroid/xDroidInstall-x86_64-v7.1021.tar.gz
+	sha256sums = 595567f6a6abfe63107fcb2b1b08b61659a5b61f97b316c5b2cd84b83f13d3b2
 
 pkgname = xdroid-bin
diff --git a/PKGBUILD b/PKGBUILD
index 00c92b82bbb6..033ffcaf701c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,7 @@
 # Maintainer: taotieren <admin@taotieren.com>
 
 pkgname=xdroid-bin
-pkgver=7.1002
-_pkgver=${pkgver}-20210820092942
+pkgver=7.1021
 pkgrel=1
 epoch=
 pkgdesc="卓懿,让安卓应用融入Linux平台应用生态体系，卓懿 x86_64 版（个人免费下载使用，不得用于商业用途）。"
@@ -21,22 +20,21 @@ backup=()
 options=('!strip')
 install=
 changelog=
-source=("${pkgname}-${pkgver}.tar.gz::https://d3.injdk.cn/xDroid/xDroidInstall-${arch}-v${_pkgver}.tar.gz")
+source=("${pkgname}-${pkgver}.tar.gz::https://d6.injdk.cn/xdroid/xDroidInstall-${arch}-v${pkgver}.tar.gz")
 noextract=(${pkgname}-${pkgver}.tar.gz)
-sha256sums=('771ae4b8cacb7bd2d6952665832257e2e16fcbff613f03727597508dd25d7920')
+sha256sums=('595567f6a6abfe63107fcb2b1b08b61659a5b61f97b316c5b2cd84b83f13d3b2')
 #validpgpkeys=()
 
 package() {
     install -dm0755 "${pkgdir}/opt/${pkgname}" \
                     "${pkgdir}/usr/bin" \
                     "${pkgdir}/usr/share/icons" \
-                    "$pkgdir/usr/share/applications"
+                    "${pkgdir}/usr/share/applications"
 
-    tar -xf "${srcdir}/${pkgname}-${pkgver}.tar.gz" --no-same-owner  --no-same-permissions --strip-components=2 -C "${pkgdir}/opt/${pkgname}"
+    tar -xf "${srcdir}/${pkgname}-${pkgver}.tar.gz" --no-same-owner  --no-same-permissions -C "${pkgdir}/opt/${pkgname}"
 
-    ln -sf "/opt/${pkgname}/xAppCenter.png" "${pkgdir}/usr/share/icons/xAppCenter.png"
-    ln -sf "/opt/${pkgname}/xAppCenter.desktop" "${pkgdir}/usr/share/applications/xAppCenter.desktop"
-    ln -sf "/opt/${pkgname}/xDroidInstall.desktop" "${pkgdir}/usr/share/applications/xDroidInstall.desktop"
+    ln -sf "/opt/${pkgname%-bin}/xAppCenter.png" "${pkgdir}/usr/share/icons/xAppCenter.png"
+    ln -sf "/opt/${pkgname%-bin}/xAppCenter.desktop" "${pkgdir}/usr/share/applications/xAppCenter.desktop"
 
     install -Dm0755 /dev/stdin "${pkgdir}/usr/bin/${pkgname%-bin}-guide" << EOF
 xdg-open https://www.linzhuotech.com/Public/Home/img/gitbook/user_manual_nv/_book/index.html
@@ -45,20 +43,32 @@ EOF
     install -Dm0755 /dev/stdin "${pkgdir}/usr/bin/xDroidInstall" << EOF
 #!/bin/env bash
 export LD_LIBRARY_PATH="/opt/${pkgname}:\$LD_LIBRARY_PATH"
-exec /opt/${pkgname}/xDroidInstall "\$@"
+exec /opt/${pkgname}/xDroidInstall-${arch}-v${pkgver}.run "\$@"
+EOF
+    install -Dm0644 /dev/stdin  "${pkgdir}/usr/share/applications/xDroidInstall.desktop" << EOF
+[Desktop Entry]
+Categories=System;
+Comment=LinZhuo xDroid xDroidInstall
+Exec=xDroidInstall
+Hidden=false
+Icon=xAppCenter
+Name=xDroidInstall
+NoDisplay=false
+Type=Application
+X-Deepin-Vendor=user-custom
 EOF
     install -Dm0755 /dev/stdin "${pkgdir}/usr/bin/xDroidUninstall" << EOF
 #!/bin/env bash
 exec /opt/${pkgname%-bin}/uninstall "\$@"
 EOF
-    install -Dm0644 /dev/stdin  "${pkgdir}/usr/share/applications/xDroidiUninstall.desktop" << EOF
+    install -Dm0644 /dev/stdin  "${pkgdir}/usr/share/applications/xDroidUninstall.desktop" << EOF
 [Desktop Entry]
 Categories=System;
-Comment=LinZhuo xDroid xDroidiUninstall
-Exec=xDroidiUninstall
+Comment=LinZhuo xDroid xDroidUninstall
+Exec=xDroidUninstall
 Hidden=false
 Icon=xAppCenter
-Name=xDroidiUninstall
+Name=xDroidUninstall
 NoDisplay=false
 Type=Application
 X-Deepin-Vendor=user-custom