update to 2.1.1

3 files changed, 52 insertions, 137 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 56526394ff26..55320a74cd1d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,24 +1,28 @@
 pkgbase = deepin-wine-douyin
 	pkgdesc = douyin,record beautify life;抖音，记录美好生活
-	pkgver = 2.0.0
+	pkgver = 2.1.1
 	pkgrel = 1
 	url = https://www.douyin.com
 	install = deepin-wine-douyin.install
 	arch = x86_64
 	license = custom
 	depends = deepin-wine6-stable
-	depends = spark-dwine-helper-git
+	depends = spark-dwine-helper
 	depends = xdg-utils
+	depends = hicolor-icon-theme
+	depends = sh
 	optdepends = wqy-microhei
 	optdepends = wqy-zenhei
 	provides = ByteDance
-	source = com.douyin.spark_1.7.1spark2_i386.deb::https://mirrors.sdu.edu.cn/spark-store-repository/store/video/com.douyin.spark/com.douyin.spark_1.7.1spark2_i386.deb
-	source = douyin-2.0.0.exe::https://www.douyin.com/download/pc/obj/douyin-pc-client/7044145585217083655/releases/10050860/2.0.0/win32-ia32/douyin-v2.0.0-win32-ia32-douyinDownload1.exe
+	source = com.douyin.spark_2.0.0spark3_i386.deb::https://mirrors.sdu.edu.cn/spark-store-repository/store/video/com.douyin.spark/com.douyin.spark_2.0.0spark3_i386.deb
+	source = douyin-2.1.1.exe::https://www.douyin.com/download/pc/obj/douyin-pc-client/7044145585217083655/releases/10199115/2.1.1/win32-ia32/douyin-v2.1.1-win32-ia32-douyinDownload1.exe
 	source = deepin-wine-douyin.install
 	source = run.sh
-	sha256sums = ddb6e863b45e4eddee273119866e73de27b10efa5e57054933153fb442f1ce10
-	sha256sums = 881d38756b7c8be78f0bb4e1ba95b506d1b684934f7de0aff10a9cf413fdf171
+	source = LICENSE.html::https://www.douyin.com/draft/douyin_agreement/douyin_agreement_user.html?id=6773906068725565448
+	sha256sums = 04a6abe0a5a4b4deff00996aaaf4f56367fccd2b2af6631a441daf5e59592961
+	sha256sums = 7f97a1f104f723aa255b70f0abc676bc47d5a4fb9279f3896860333d8a2da59a
 	sha256sums = e476028b1c94fe6a4d1a24e4b603667a39276c21dfbe76433c42cf64a73d16be
-	sha256sums = d5a35c9e693dc1ce627e69f4fa14519476db90c29ae294db2f7abfeee330ebbb
+	sha256sums = 96cc65ef1c499808785a4b41c322fa0887d3d717172bdc9cc0c8f1636cdf761d
+	sha256sums = 66ef6c0a87c002d3fdff731048420b83f023118878bedd784c52ddac659035f6
 
 pkgname = deepin-wine-douyin
diff --git a/PKGBUILD b/PKGBUILD
index e6deae5dcf81..221692ac4a5f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,54 +1,51 @@
 # Maintainer: zxp19821005 <zxp19821005 at 163 dot com>
-pkgname=deepin-wine-douyin
-_pkgname=com.douyin.spark
-_officalname=douyin
+_appname=douyin
+pkgname="deepin-wine-${_appname}"
+_pkgname="com.${_appname}.spark"
 _providername=ByteDance
-pkgver=2.0.0
-sparkver=1.7.1spark2
+pkgver=2.1.1
+sparkver=2.0.0spark3
 pkgrel=1
 epoch=
 pkgdesc="douyin,record beautify life;抖音，记录美好生活"
-arch=("x86_64")
+arch=('x86_64')
 url="https://www.douyin.com"
 license=('custom')
-depends=('deepin-wine6-stable' 'spark-dwine-helper-git' 'xdg-utils')
+depends=('deepin-wine6-stable' 'spark-dwine-helper' 'xdg-utils' 'hicolor-icon-theme' 'sh')
 optdepends=('wqy-microhei' 'wqy-zenhei')
 conflicts=()
 provides=("${_providername}")
 install="${pkgname}.install"
 source=(
     "${_pkgname}_${sparkver}_i386.deb::https://mirrors.sdu.edu.cn/spark-store-repository/store/video/${_pkgname}/${_pkgname}_${sparkver}_i386.deb"
-	"${_officalname}-${pkgver}.exe::${url}/download/pc/obj/${_officalname}-pc-client/7044145585217083655/releases/10050860/${pkgver}/win32-ia32/${_officalname}-v${pkgver}-win32-ia32-douyinDownload1.exe"
+	"${_appname}-${pkgver}.exe::${url}/download/pc/obj/${_appname}-pc-client/7044145585217083655/releases/10199115/${pkgver}/win32-ia32/${_appname}-v${pkgver}-win32-ia32-${_appname}Download1.exe"
 	"${pkgname}.install"
     "run.sh"
+    "LICENSE.html::${url}/draft/douyin_agreement/douyin_agreement_user.html?id=6773906068725565448"
     )
-sha256sums=('ddb6e863b45e4eddee273119866e73de27b10efa5e57054933153fb442f1ce10'
-            '881d38756b7c8be78f0bb4e1ba95b506d1b684934f7de0aff10a9cf413fdf171'
+sha256sums=('04a6abe0a5a4b4deff00996aaaf4f56367fccd2b2af6631a441daf5e59592961'
+            '7f97a1f104f723aa255b70f0abc676bc47d5a4fb9279f3896860333d8a2da59a'
             'e476028b1c94fe6a4d1a24e4b603667a39276c21dfbe76433c42cf64a73d16be'
-            'd5a35c9e693dc1ce627e69f4fa14519476db90c29ae294db2f7abfeee330ebbb')
+            '96cc65ef1c499808785a4b41c322fa0887d3d717172bdc9cc0c8f1636cdf761d'
+            '66ef6c0a87c002d3fdff731048420b83f023118878bedd784c52ddac659035f6')
 
 prepare() {
     bsdtar -xf data.tar.xz
     mv "${srcdir}/opt/apps/${_pkgname}" "${srcdir}/opt/apps/${pkgname}"
-    mkdir -p "${srcdir}/tmp"
-    msg "Extracting Deepin Wine ${_officalname} archive ..."
-    7za x -aoa "${srcdir}/opt/apps/${pkgname}/files/files.7z" -o"${srcdir}/tmp"
-    
-    msg "Copying latest ${_officalname} installer to ${srcdir}/tmp/drive_c/Program Files/${_providername}/${_officalname} ..."
-    rm -r "${srcdir}/tmp/drive_c/Program Files/${_providername}/${_officalname}"
-    mkdir -p "${srcdir}/tmp/drive_c/Program Files/${_providername}/${_officalname}"
-    install -m644 "${_officalname}-${pkgver}.exe" "${srcdir}/tmp/drive_c/Program Files/${_providername}/${_officalname}/${_officalname}-${pkgver}.exe"
+    mkdir -p "${srcdir}/tmp" "${srcdir}/extracted_exe"
+    msg "Extracting Deepin Wine ${_appname} archive ..."
+    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} ..."
+    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"
-    7za a -t7z -r "${srcdir}/opt/apps/${pkgname}/files/files.7z" "${srcdir}/tmp/*"
+    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/com.douyin.spark/deepin-wine-douyin/g' -i "${srcdir}/opt/apps/${pkgname}/entries/applications/${pkgname}.desktop"
-    sed 's/Video/AudioVideo/g' -i "${srcdir}/opt/apps/${pkgname}/entries/applications/${pkgname}.desktop"
-    echo "Icon=deepin-wine-douyin.png" >> "${srcdir}/opt/apps/${pkgname}/entries/applications/${pkgname}.desktop"
-    rm -rf "${srcdir}/opt/apps/${_pkgname}/info"
+    sed 's|com.douyin.spark|deepin-wine-douyin|g;s|Video|AudioVideo|g' -i "${srcdir}/opt/apps/${pkgname}/entries/applications/${pkgname}.desktop"
 }
    
 package() {
@@ -57,4 +54,5 @@ package() {
     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 "LICENSE.html" -t "${pkgdir}/usr/share/licenses/${pkgname}"
 }
diff --git a/run.sh b/run.sh
index 14d20d6abd45..10588adb2967 100755
--- a/run.sh
+++ b/run.sh
@@ -1,117 +1,30 @@
 #!/bin/sh
- 
+   
 #   Copyright (C) 2016 Deepin, Inc.
 #
 #   Author:     Li LongYu <lilongyu@linuxdeepin.com>
 #               Peng Hao <penghao@linuxdeepin.com>
  
-#               Vufa <countstarlight@gmail.com>
- 
+version_gt() { test "$(echo "$@" | tr " " "\n" | sort -V | head -n 1)" != "$1"; }
 BOTTLENAME="Deepin-douyin"
-APPVER="1.7.1spark2"
-WINEPREFIX="$HOME/.deepinwine/${BOTTLENAME}"
-DOUYIN_INSTALLER="douyin"
-DOUYIN_VER="2.0.0"
-DOUYIN_INSTALLER_PATH="C:/Program Files/ByteDance/${DOUYIN_INSTALLER}/${DOUYIN_INSTALLER}-${DOUYIN_VER}.exe"
-EXEC_PATH="C:/Program Files/ByteDance/${DOUYIN_INSTALLER}/${DOUYIN_VER}/${DOUYIN_INSTALLER}.exe"
-EXEC_FILE="${WINEPREFIX}/drive_c/Program Files/ByteDance/${DOUYIN_INSTALLER}/${DOUYIN_VER}/${DOUYIN_INSTALLER}.exe"
+APPVER="2.1.1"
+WINEPREFIX="${HOME}/.deepinwine/${BOTTLENAME}"
+EXEC_PATH="c:/Program Files/ByteDance/douyin/douyin.exe"
 START_SHELL_PATH="/opt/deepinwine/tools/run_v4.sh"
 export MIME_TYPE=""
 export DEB_PACKAGE_NAME="deepin-wine-douyin"
 export APPRUN_CMD="deepin-wine6-stable"
-DISABLE_ATTACH_FILE_DIALOG=""
-EXPORT_ENVS=""
-SPECIFY_SHELL_DIR=$(dirname ${START_SHELL_PATH})
-
-export SPECIFY_SHELL_DIR
- 
-ARCHIVE_FILE_DIR="/opt/apps/${DEB_PACKAGE_NAME}/files"
- 
-export WINEDLLPATH=/opt/${APPRUN_CMD}/lib:/opt/${APPRUN_CMD}/lib64
- 
-export LD_LIBRARY_PATH=/opt/apps/${DEB_PACKAGE_NAME}/files/lib32
- 
-export WINEPREDLL="${ARCHIVE_FILE_DIR}/dlls"
- 
-msg() {
-    ECHO_LEVEL=("\033[1;32m==> " "\033[1;31m==> ERROR: ")
-    echo -e "${ECHO_LEVEL[$1]}\033[1;37m$2\033[0m"
-}
- 
-OpenWinecfg() {
-    msg 0 "Launching winecfg with ${APPRUN_CMD} in ${WINEPREFIX} ..."
-    env WINEPREFIX="${WINEPREFIX}" ${APPRUN_CMD} winecfg
-}
- 
-DeployApp() {
-    # deploy bottle
-    msg 0 "Deploying ${WINEPREFIX} ..."
-    rm -rf "${WINEPREFIX}"
-    # run installer
-    msg 0 "Launching ${DOUYIN_INSTALLER_PATH} ..."
-    env WINEDLLOVERRIDES="winemenubuilder.exe=d" ${START_SHELL_PATH} ${BOTTLENAME} ${APPVER} "${DOUYIN_INSTALLER_PATH}" "$@"
-
-    touch "${WINEPREFIX}"/reinstalled
-    msg 0 "Creating ${WINEPREFIX}/PACKAGE_VERSION ..."
-    cat /opt/apps/${DEB_PACKAGE_NAME}/files/files.md5sum >"${WINEPREFIX}"/PACKAGE_VERSION
-}
-
-WakeApp() {
-    env WINEPREDLL="${ARCHIVE_FILE_DIR}/dlls" \
-        WINEDLLPATH=/opt/${APPRUN_CMD}/lib:/opt/${APPRUN_CMD}/lib64 \
-        WINEPREFIX="${WINEPREFIX}" ${APPRUN_CMD} /opt/deepinwine/tools/sendkeys.exe w
-}
-
-Run() {
-    if [ -z "${DISABLE_ATTACH_FILE_DIALOG}" ]; then
-        export ATTACH_FILE_DIALOG=1
-    fi
- 
-    if [ -n "${EXPORT_ENVS}" ]; then
-        export "${EXPORT_ENVS}"
-    fi
- 
-    if [ -n "${EXEC_PATH}" ]; then
-        if [ ! -f "${WINEPREFIX}/reinstalled" ] || [ ! -f "$EXEC_FILE" ]; then
-            DeployApp "$@"
-            exit 0
-        fi
- 
-        if [ -z "${EXEC_PATH##*.lnk*}" ]; then
-            msg 0 "Launching  ${EXEC_PATH} lnk file ..."
-            ${START_SHELL_PATH} ${BOTTLENAME} ${APPVER} "C:/windows/command/start.exe" "/Unix" "${EXEC_PATH}" "$@"
-        else
-            msg 0 "Launching  ${EXEC_PATH} ..."
-            ${START_SHELL_PATH} ${BOTTLENAME} ${APPVER} "${EXEC_PATH}" "$@"
-        fi
-    else
-        ${START_SHELL_PATH} ${BOTTLENAME} ${APPVER} "uninstaller.exe" "$@"
-    fi
-}
- 
-HelpApp() {
-    echo " Extra Commands:"
-    echo " winecfg          Open winecfg"
-    echo " -w/--wake       Wake up background program"
-    echo " -h/--help        Show program help info"
-}
- 
-if [ -z "$1" ]; then
-    Run "$@"
-    exit 0
+DISABLE_ATTACH_FILE_DIALOG="1"
+export SPECIFY_SHELL_DIR=`dirname ${START_SHELL_PATH}`
+ARCHIVE_FILE_DIR="/opt/apps/$DEB_PACKAGE_NAME/files"
+export WINEPREDLL="$ARCHIVE_FILE_DIR/dlls"
+   
+if [ -z "$DISABLE_ATTACH_FILE_DIALOG" ];then
+    export ATTACH_FILE_DIALOG=1
 fi
-case $1 in
-"winecfg")
-    OpenWinecfg
-    ;;
-"-w" | "--wake")
-    WakeApp "$@"
-    ;;
-"-h" | "--help")
-    HelpApp "$@"
-    ;;
-*)
-    Run "$@"
-    ;;
-esac
-exit 0
\ No newline at end of file
+   
+if [ -n "$EXEC_PATH" ];then
+    $START_SHELL_PATH $BOTTLENAME $APPVER "$EXEC_PATH" "$@"
+else
+    $START_SHELL_PATH $BOTTLENAME $APPVER "uninstaller.exe" "$@"
+fi
\ No newline at end of file