optimused the scripts,fix some errors

1 files changed, 56 insertions, 55 deletions

diff --git a/run.sh b/run.sh
index 98eccf486b4e..2435026b9d5e 100755
--- a/run.sh
+++ b/run.sh
@@ -1,101 +1,102 @@
 #!/bin/sh
-
+ 
 #   Copyright (C) 2016 Deepin, Inc.
 #
 #   Author:     Li LongYu <lilongyu@linuxdeepin.com>
 #               Peng Hao <penghao@linuxdeepin.com>
-
+ 
 #               Vufa <countstarlight@gmail.com>
-
-BOTTLENAME="Spark-douyin"
+ 
+BOTTLENAME="Deepin-douyin"
 APPVER="1.7.1spark2"
-WINEPREFIX="$HOME/.deepinwine/$BOTTLENAME"
-DOUYIN_VER="1.8.0"
-EXEC_PATH="c:/Program Files/ByteDance/douyin/douyin.exe"
-EXEC_FILE="$WINEPREFIX/drive_c/Program Files/ByteDance/douyin/douyin.exe"
+WINEPREFIX="$HOME/.deepinwine/${BOTTLENAME}"
+EXEC_PATH="C:/Program Files/ByteDance/douyin.exe"
+EXEC_FILE="${WINEPREFIX}/drive_c/Program Files/ByteDance/douyin.exe"
 START_SHELL_PATH="/opt/deepinwine/tools/run_v4.sh"
 DOUYIN_INSTALLER="douyin"
-DOUYIN_INSTALLER_PATH="c:/Program Files/ByteDance/$DOUYIN_INSTALLER-$DOUYIN_VER.exe"
+DOUYIN_VER="1.8.0"
+DOUYIN_INSTALLER_PATH="C:/Program Files/ByteDance/${DOUYIN_INSTALLER}-${DOUYIN_VER}.exe"
 export MIME_TYPE=""
-export DEB_PACKAGE_NAME="com.douyin.spark"
+export DEB_PACKAGE_NAME="deepin-wine-douyin"
 export APPRUN_CMD="deepin-wine6-stable"
 DISABLE_ATTACH_FILE_DIALOG=""
 EXPORT_ENVS=""
-
-export SPECIFY_SHELL_DIR=$(dirname $START_SHELL_PATH)
-
-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"
-
+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
+    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"
+    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" "$@"
+    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
+    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
+    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
+    if [ -z "${DISABLE_ATTACH_FILE_DIALOG}" ]; then
         export ATTACH_FILE_DIALOG=1
     fi
-
-    if [ -n "$EXPORT_ENVS" ]; then
-        export $EXPORT_ENVS
+ 
+    if [ -n "${EXPORT_ENVS}" ]; then
+        export "${EXPORT_ENVS}"
     fi
-
-    if [ -n "$EXEC_PATH" ]; then
-        if [ ! -f "$WINEPREFIX/reinstalled" ] || [ ! -f "$EXEC_FILE" ]; then
-            DeployApp
+ 
+    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" "$@"
+            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" "$@"
+            msg 0 "Launching  ${EXEC_PATH} ..."
+            ${START_SHELL_PATH} ${BOTTLENAME} ${APPVER} "${EXEC_PATH}" "$@"
         fi
     else
-        $START_SHELL_PATH $BOTTLENAME $APPVER "uninstaller.exe" "$@"
+        ${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
+ 
+if [ -z "$1" ]; then
     Run "$@"
     exit 0
 fi
@@ -104,13 +105,13 @@ case $1 in
     OpenWinecfg
     ;;
 "-w" | "--wake")
-    WakeApp
+    WakeApp "$@"
     ;;
 "-h" | "--help")
-    HelpApp
+    HelpApp "$@"
     ;;
 *)
     Run "$@"
     ;;
 esac
-exit 0
+exit 0
\ No newline at end of file