符号错误

Merge pull request !12 from RX6900XT/master

spark-dwine-helper/build.sh

@@ -30,6 +30,7 @@ Section: utils
 Priority: extra
 Recommends: spark-dwine-helper-settings
 Multi-Arch: foreign
+Provides: store.spark-app.spark-dwine-helper(=$version)
 Replaces: store.spark-app.spark-dwine-helper(<=$version)
 Homepage: https://gitee.com/deepin-community-store/spark-wine
 Description: Spark Deepin Wine Helper

spark-dwine-helper/postrm

@@ -1,3 +1,4 @@
+#!/bin/bash
 if [ "$1" = "remove" ] || [ "$1" = "purge" ];then
 
 echo "清理卸载残留"

spark-dwine-helper/s-wine-helper/deepinwine/tools/spark_run_v4.sh

@@ -142,7 +142,7 @@ CallProcess()
     if [ -n "$MIME_TYPE" ]; then
         xdg-mime default "$DEB_PACKAGE_NAME".desktop "$MIME_TYPE"
     fi
-    # Unuse winemenubuilder
+    # Disable winemenubuilder
     env WINEPREFIX="$WINEPREFIX" $WINE_CMD reg add 'HKEY_CURRENT_USER\Software\Wine\DllOverrides' /v winemenubuilder.exe /f
     debug_log_to_file "Starting process $* ..."
 	#############  WARNING: Here is the modified content: Now will run set-dwine-scale.sh
@@ -159,6 +159,13 @@ CallProcess()
 ###有设置mimetype和自动启动(这个暂时没分析)的功能
 
 ###########专属优化段：
+
+CalleCloud()
+{
+    chmod 000 ${WINEPREFIX}/drive_c/users/${USER}/Temp
+    CallProcess "$@"
+}
+
 CallDouyin()
 {
     if [ -f "${WINEPREFIX}/drive_c/users/${USER}/Application Data/douyin" ]; then
@@ -391,6 +398,8 @@ CallQQGameV2()
     CallProcess "$1" -action:force_download -appid:${2} -pid:8 -bin_version:1.1.2.4 -loginuin: 
 }
 
+
+
 CallPsCs6()
 {
     #get file full path
@@ -417,13 +426,30 @@ CallPsCs6()
     CallProcess "$@"
 }
 
+CallIE8()
+{
+    rm -f "$WINEPREFIX/system.reg"
+    cp $APPDIR/system.reg "$WINEPREFIX/system.reg"
+    CallProcess "$@"
+}
+
 #####专属优化段结束
 
+UnixUriToDosPath()
+{
+    OPEN_FILE="$1"
+    if [ -f "$OPEN_FILE" ]; then
+        OPEN_FILE=$(realpath "$OPEN_FILE")
+        OPEN_FILE="z:$OPEN_FILE"
+        OPEN_FILE=$(echo $OPEN_FILE | sed -e 's/\//\\\\/g')
+    fi
+    echo $OPEN_FILE
+}
+
 #arg 1: exec file path
 #arg 2: autostart ,or exec arg 1
 #arg 3: exec arg 2
 
-
 #### CallApp段，根据容器名找专属优化，没有就走通用启动
 CallApp()
 {
@@ -437,10 +463,10 @@ CallApp()
         "Deepin-ZhuMu")
             CallZhuMu "$@"
             ;;
-        "Deepin-QQ"|"Wine-QQ"|"Spark-QQ")
+        "Deepin-QQ"|"Wine-QQ"|"Spark-QQ"|"Deepin-QQ-Spark")
             CallQQ "$@"
             ;;
-        "Deepin-TIM")
+        "Deepin-TIM"|"Spark-TIM")
             CallTIM "$@"
             ;;
         "Deepin-QQGame"*)
@@ -452,7 +478,7 @@ CallApp()
         "Deepin-WeChat")
             CallWeChat "$@"
             ;;
-        "Deepin-WXWork"|"Spark-WeCom")
+        "Deepin-WXWork"|"Spark-WeCom"|"wxwork-spark-uk")
             CallWXWork "$@"
             ;;
         "Deepin-Dding")
@@ -500,7 +526,13 @@ CallApp()
 	    "Spark-douyin")
             CallDouyin "$@"
             ;;
-        *)
+	    "Spark-ecloud")
+            CalleCloud "$@"
+            ;;
+	    "IE8")
+            CallIE8 "$@"
+            ;;
+        *)        
             CallProcess "$@"
             ;;
     esac
@@ -589,10 +621,14 @@ ParseArgs()
 {
     if [ $# -eq 4 ];then
 	    RunApp "$3"
-    elif [ $# -eq 5 ];then
-	    RunApp "$3" "$5"
+    elif [ -f "$5" ];then
+	    if [ -n "$MIME_EXEC" ];then
+		    RunApp "$MIME_EXEC" "$(UnixUriToDosPath "$5")" "${@:6}"
+	    else
+		    RunApp "$3" "$(UnixUriToDosPath "$5")" "${@:6}"
+	    fi
     else
-	    RunApp "$3" "$5" "$6"
+	    RunApp "$3" "${@:5}"
     fi
 }
 

spark-dwine-launch/postrm_template

@@ -0,0 +1,27 @@
+#!/bin/bash
+if [ "$1" = "remove" ] || [ "$1" = "purge" ];then
+
+echo "清理卸载残留"
+CONTAINER_NAME=""
+
+if [ -z $CONTAINER_NAME ];then
+echo "W: 没有指定容器，跳过清理容器。请手动前往 ~/.deepinwine/ 下删除"
+exit
+fi
+
+if [ -e /opt/deepinwine/tools/kill.sh ];then
+/opt/deepinwine/tools/kill.sh $CONTAINER_NAME
+###这里注意，如果没写CONTAINER_NAME,会把QQ杀了
+fi
+
+for username in $(ls /home)  
+    do
+      echo /home/$username
+        if [ -d /home/$username/.deepinwine/$CONTAINER_NAME ]  
+        then
+        rm -rf /home/$username/.deepinwine/$CONTAINER_NAME
+        fi
+    done
+else
+echo "非卸载，跳过清理"
+fi