update to 2.1.1

1 files changed, 18 insertions, 105 deletions

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