update to 2.9.2

3 files changed, 25 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 28412fa7dec1..4f780741e6c4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,28 +1,28 @@
 pkgbase = deepin-wine-douyin
 	pkgdesc = douyin,record beautify life;抖音，记录美好生活
-	pkgver = 2.8.0
+	pkgver = 2.9.2
 	pkgrel = 1
 	url = https://www.douyin.com
 	install = deepin-wine-douyin.install
 	arch = x86_64
 	license = custom
+	makedepends = p7zip
 	depends = deepin-wine6-stable
 	depends = spark-dwine-helper
 	depends = xdg-utils
-	depends = hicolor-icon-theme
 	depends = sh
 	optdepends = wqy-microhei
 	optdepends = wqy-zenhei
 	conflicts = douyin
 	source = com.douyin.spark_2.5.0spark6_i386.deb::https://mirrors.sdu.edu.cn/spark-store-repository/store/video/com.douyin.spark/com.douyin.spark_2.5.0spark6_i386.deb
-	source = douyin-2.8.0.exe::https://www.douyin.com/download/pc/obj/douyin-pc-client/7044145585217083655/releases/10904299/2.8.0/win32-ia32/douyin-v2.8.0-win32-ia32-douyinDownload1.exe
+	source = douyin-2.9.2.exe::https://webcdn.m.qq.com/spcmgr/download/douyin-v2.9.2-win32-ia32-tencent.exe
 	source = deepin-wine-douyin.install
 	source = run.sh
 	source = LICENSE.html::https://www.douyin.com/draft/douyin_agreement/douyin_agreement_user.html
 	sha256sums = d2913afe2d65b9b1840ed644182cb6ffb565c14538d42d035f13be5658247842
-	sha256sums = 787c43db4368a279e784d09ed854b98aeded5e7f0fd4c98521b299aa0f36bfab
+	sha256sums = 8532e53e95730513b88387a690ddef1211154488992f339510a48028970e55f3
 	sha256sums = e476028b1c94fe6a4d1a24e4b603667a39276c21dfbe76433c42cf64a73d16be
-	sha256sums = aa16d384b91530d9b8b7ebb3924a225c0ba21229a41280ca58834ef6bb699d6e
-	sha256sums = 04b79c505f956a56144ecd5df76034bf56959ffd1ab9c4524177f71666c0f369
+	sha256sums = d79124897371fb614d86d7e6b54d189442284b83b04028bfcd83dcddf39473d6
+	sha256sums = 80d1bfb7a530d4497e8be2305e2ee662a25c4d6bc2e8f1b3a24642eec7efd054
 
 pkgname = deepin-wine-douyin
diff --git a/PKGBUILD b/PKGBUILD
index 1a9598d8c7ac..4972fc142908 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,28 +3,30 @@ _appname=douyin
 pkgname="deepin-wine-${_appname}"
 _pkgname="com.${_appname}.spark"
 _providername=ByteDance
-pkgver=2.8.0
+pkgver=2.9.2
 sparkver=2.5.0spark6
 pkgrel=1
 pkgdesc="douyin,record beautify life;抖音，记录美好生活"
 arch=('x86_64')
 url="https://www.douyin.com"
+_downurl="https://webcdn.m.qq.com/spcmgr/download"
 license=('custom')
-depends=('deepin-wine6-stable' 'spark-dwine-helper' 'xdg-utils' 'hicolor-icon-theme' 'sh')
+depends=('deepin-wine6-stable' 'spark-dwine-helper' 'xdg-utils' 'sh')
+makedepends=('p7zip')
 optdepends=('wqy-microhei' 'wqy-zenhei')
 conflicts=("${_appname}")
 install="${pkgname}.install"
 source=("${_pkgname}_${sparkver}_i386.deb::https://mirrors.sdu.edu.cn/spark-store-repository/store/video/${_pkgname}/${_pkgname}_${sparkver}_i386.deb"
-	"${_appname}-${pkgver}.exe::${url}/download/pc/obj/${_appname}-pc-client/7044145585217083655/releases/10904299/${pkgver}/win32-ia32/${_appname}-v${pkgver}-win32-ia32-${_appname}Download1.exe"
+	"${_appname}-${pkgver}.exe::${_downurl}/${_appname}-v${pkgver}-win32-ia32-tencent.exe"
 	"${pkgname}.install"
     "run.sh"
     "LICENSE.html::${url}/draft/douyin_agreement/douyin_agreement_user.html")
 sha256sums=('d2913afe2d65b9b1840ed644182cb6ffb565c14538d42d035f13be5658247842'
-            '787c43db4368a279e784d09ed854b98aeded5e7f0fd4c98521b299aa0f36bfab'
+            '8532e53e95730513b88387a690ddef1211154488992f339510a48028970e55f3'
             'e476028b1c94fe6a4d1a24e4b603667a39276c21dfbe76433c42cf64a73d16be'
-            'aa16d384b91530d9b8b7ebb3924a225c0ba21229a41280ca58834ef6bb699d6e'
-            '04b79c505f956a56144ecd5df76034bf56959ffd1ab9c4524177f71666c0f369')
-prepare() {
+            'd79124897371fb614d86d7e6b54d189442284b83b04028bfcd83dcddf39473d6'
+            '80d1bfb7a530d4497e8be2305e2ee662a25c4d6bc2e8f1b3a24642eec7efd054')
+build() {
     bsdtar -xf "${srcdir}/data.tar.xz"
     mv "${srcdir}/opt/apps/${_pkgname}" "${srcdir}/opt/apps/${pkgname}"
     mkdir -p "${srcdir}/tmp" "${srcdir}/extracted_exe"
@@ -32,19 +34,21 @@ prepare() {
     7z x -aoa "${srcdir}/opt/apps/${pkgname}/files/files.7z" -o"${srcdir}/tmp"
     7z e -aoa "${srcdir}/${_appname}-${pkgver}.exe" -o"${srcdir}/extracted_exe"    
     msg "Extract latest ${_appname} installer to ${srcdir}/tmp/drive_c/Program Files/${_providername}/${_appname} ..."
+    rm -rf "${srcdir}/tmp/drive_c/Program Files/${_providername}/${_appname}"
+    mkdir -p "${srcdir}/tmp/drive_c/Program Files/${_providername}/${_appname}"
     bsdtar -xf "${srcdir}/extracted_exe/app.7z" -C "${srcdir}/tmp/drive_c/Program Files/${_providername}/${_appname}"
     msg "Repackaging app archive ..."
     rm -r "${srcdir}/opt/apps/${pkgname}/files/files.7z" "${srcdir}/opt/apps/${pkgname}/info"
-    7z a -t7z -r "${srcdir}/opt/apps/${pkgname}/files/files.7z" "${srcdir}/tmp/*"
-    mv "${srcdir}/opt/apps/${pkgname}/entries/applications/${_pkgname}.desktop" "${srcdir}/opt/apps/${pkgname}/entries/applications/${pkgname}.desktop"
-    mv "${srcdir}/opt/apps/${pkgname}/entries/icons/hicolor/scalable/apps/${_pkgname}.png" "${srcdir}/opt/apps/${pkgname}/entries/icons/hicolor/scalable/apps/${pkgname}.png"
-    sed "s|${_pkgname}|${pkgname}|g;s|Video|AudioVideo|g" -i "${srcdir}/opt/apps/${pkgname}/entries/applications/${pkgname}.desktop"
+    7z a -t7z -r "${srcdir}/opt/apps/${pkgname}/files/files.7z" "${srcdir}/tmp/"*
+    sed -e "s|Icon=${_pkgname}|Icon=${pkgname}|g" \
+        -e "s|\"/opt/apps/${_pkgname}/files/run.sh\"|${pkgname}|g" \
+        -i "${srcdir}/opt/apps/${pkgname}/entries/applications/${pkgname}.desktop"
 }
 package() {
     cp -r "${srcdir}/opt" "${pkgdir}"
     md5sum "${pkgdir}/opt/apps/${pkgname}/files/files.7z" | awk '{ print $1 }' > "${pkgdir}/opt/apps/${pkgname}/files/files.md5sum"
-    install -Dm644 "${srcdir}/opt/apps/${pkgname}/entries/applications/${pkgname}.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop"
-    install -Dm644 "${srcdir}/opt/apps/${pkgname}/entries/icons/hicolor/scalable/apps/${pkgname}.png" "${pkgdir}/usr/share/icons/hicolor/scalable/apps/${pkgname}.png"
-    install -Dm755 "run.sh" "${pkgdir}/opt/apps/${pkgname}/files/"
+    install -Dm644 "${srcdir}/opt/apps/${pkgname}/entries/applications/${_pkgname}.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop"
+    install -Dm644 "${srcdir}/opt/apps/${pkgname}/entries/icons/hicolor/scalable/apps/${_pkgname}.png" "${pkgdir}/usr/share/pixmaps/${pkgname}.png"
+    install -Dm755 "run.sh" "${pkgdir}/usr/bin/${pkgname}"
     install -Dm644 "LICENSE.html" -t "${pkgdir}/usr/share/licenses/${pkgname}"
 }
\ No newline at end of file
diff --git a/run.sh b/run.sh
index 7539c7b6fcfc..66224542fe14 100755
--- a/run.sh
+++ b/run.sh
@@ -7,7 +7,7 @@
  
 version_gt() { test "$(echo "$@" | tr " " "\n" | sort -V | head -n 1)" != "$1"; }
 BOTTLENAME="Deepin-douyin"
-APPVER="2.8.0"
+APPVER="2.9.2"
 WINEPREFIX="${HOME}/.deepinwine/${BOTTLENAME}"
 EXEC_PATH="c:/Program Files/ByteDance/douyin/douyin.exe"
 START_SHELL_PATH="/opt/deepinwine/tools/run_v4.sh"