仅仅在是链接时候才确认是mydoc

Signed-off-by: shenmo <jifengshenmo@outlook.com>

spark-dwine-helper/build.sh

@@ -25,11 +25,12 @@ Version: $version
 Architecture: all
 Maintainer: shenmo <shenmo@spark-app.store>
 Installed-Size: $SIZE
-Depends: zenity:amd64, p7zip-full:amd64, fonts-noto-cjk,deepin-wine-helper(>=5.1)
+Depends: zenity, p7zip-full, fonts-noto-cjk,transhell
 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
@@ -84,7 +85,7 @@ Version: $version
 Architecture: all
 Maintainer: shenmo <shenmo@spark-app.store>
 Installed-Size: $SIZE
-Depends: zenity:amd64, p7zip-full:amd64, fonts-noto-cjk,deepin-wine-helper(>=5.1)
+Depends: zenity, p7zip-full, fonts-noto-cjk,transhell
 Section: utils
 Priority: extra
 Recommends: spark-dwine-helper-settings
@@ -111,11 +112,11 @@ SIZE=`echo ${SIZE%%.*}`
 
 cat  << EOF >pkg/DEBIAN/control
 Package: spark-dwine-helper-settings
-Version: 1.2
+Version: 1.3.2
 Architecture: all
 Maintainer: shenmo <shenmo@spark-app.store>
 Installed-Size: $SIZE
-Depends: spark-dwine-helper(>=1.6)
+Depends: spark-dwine-helper(>=1.6),transhell,zenity
 Section: utils
 Priority: extra
 Multi-Arch: foreign
@@ -130,4 +131,4 @@ cd pkg && fakeroot dpkg-deb -Z xz -b . ../
 cd ..
 
 echo "helper deb包已经准备好"
-rm -rf pkg/
+rm -rf pkg/

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_get_tray_window

@@ -0,0 +1,28 @@
+#!/usr/bin/env python2
+# vim: set ts=4 sw=4 fileencoding=utf-8:
+# Luomio <nohappiness@gmail.com>
+# Filename: dde-first-run.py
+# Create Date: 27-03, 13
+
+def get_tray_window():
+    try:
+        import gobject
+        from dbus import glib
+        import dbus
+    except ImportError:
+        return False
+
+    gobject.threads_init()
+    glib.init_threads()
+    bus = dbus.SessionBus()
+    traymanager = bus.get_object("com.deepin.dde.TrayManager", "/com/deepin/dde/TrayManager")
+
+    windows = traymanager.Get("com.deepin.dde.TrayManager","TrayIcons")
+    str="window_id:"
+    for i in xrange(len(windows)):
+        str += '{:#x} '.format(windows[i])
+
+    print(str)
+
+if __name__ == "__main__":
+    get_tray_window()

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

@@ -0,0 +1,277 @@
+#!/bin/bash
+#####因为arm版本的deepin-wine-helper不带这个，又不想破坏x86兼容性，故改名
+APP_NAME="QQ"
+LOG_FILE=$0
+SHELL_DIR=${0%/*}
+if [ $SPECIFY_SHELL_DIR ]; then
+    SHELL_DIR=$SPECIFY_SHELL_DIR
+fi
+
+PUBLIC_DIR="/var/public"
+
+UsePublicDir()
+{
+    if [ -z "$USE_PUBLIC_DIR" ]; then
+        echo "Don't use public dir"
+        return 1
+    fi
+    if [ ! -d "$PUBLIC_DIR" ];then
+        echo "Not found $PUBLIC_DIR"
+        return 1
+    fi
+    if [ ! -r "$PUBLIC_DIR" ];then
+        echo "Can't read for $PUBLIC_DIR"
+        return 1
+    fi
+    if [ ! -w "$PUBLIC_DIR" ];then
+        echo "Can't write for $PUBLIC_DIR"
+        return 1
+    fi
+    if [ ! -x "$PUBLIC_DIR" ];then
+        echo "Can't excute for $PUBLIC_DIR"
+        return 1
+    fi
+
+    return 0
+}
+
+WINE_BOTTLE="$HOME/.deepinwine"
+
+if UsePublicDir;then
+    WINE_BOTTLE="$PUBLIC_DIR"
+fi
+
+get_wine_by_pid()
+{
+    wine_path=$(cat /proc/$1/maps | grep -E "\/wine$|\/wine64$|\/wine |\/wine64 " | head -1 | awk '{print $6}')
+    if [ -z "$wine_path" ];then
+        cat /proc/$1/cmdline| xargs -0 -L1 -I{} echo {} | grep -E "\/wine$|\/wine64$|\/wine |\/wine64 " | head -1
+    else
+        echo $wine_path
+    fi
+}
+
+is_wine_process()
+{
+    wine_module=$(get_wine_by_pid $1)
+    if [ -z "$wine_module" ];then
+        wine_module=$(cat /proc/$1/maps | grep -E "\/wineserver$" | head -1)
+    fi
+    echo $wine_module
+}
+
+get_prefix_by_pid()
+{
+    WINE_PREFIX=$(xargs -0 printf '%s\n' < /proc/$1/environ | grep WINEPREFIX)
+    WINE_PREFIX=${WINE_PREFIX##*=}
+    if [ -z "$WINE_PREFIX" ] && [ -n "$(is_wine_process $1)" ]; then
+        #不指定容器的情况用默认容器目录
+        WINE_PREFIX="$HOME/.wine"
+    fi
+    if [ -n "$WINE_PREFIX" ];then
+        WINE_PREFIX=$(realpath $WINE_PREFIX)
+        echo $WINE_PREFIX
+    fi
+}
+
+get_wineserver()
+{
+    if [ -z "$1" ];then
+        return
+    fi
+    targ_prefix=$(realpath $1)
+    ps -ef | grep wineserver | while read server_info ;do
+        debug_log_to_file "get server info: $server_info"
+        server_pid=$(echo $server_info | awk '{print $2}')
+        server_prefix=$(get_prefix_by_pid $server_pid)
+        debug_log_to_file "get server pid $server_pid, prefix: $server_prefix"
+
+        if [ "$targ_prefix" = "$server_prefix" ];then
+            server=$(echo $server_info | awk '{print $NF}')
+            if [ "-p0" = "$server" ];then
+                server=$(echo $server_info | awk '{print $(NF-1)}')
+            fi
+            debug_log_to_file "get server $server"
+            echo $server
+            return
+        fi
+    done
+}
+
+init_log_file()
+{
+    if [ -d "$DEBUG_LOG" ];then
+        LOG_DIR=$(realpath $DEBUG_LOG)
+        if [ -d "$LOG_DIR" ];then
+            LOG_FILE="${LOG_DIR}/${LOG_FILE##*/}.log"
+            echo "" > "$LOG_FILE"
+            debug_log "LOG_FILE=$LOG_FILE"
+        fi
+    fi
+}
+
+debug_log_to_file()
+{
+    if [ -d "$DEBUG_LOG" ];then
+        strDate=$(date)
+        echo -e "${strDate}:${1}" >> "$LOG_FILE"
+    fi
+}
+
+debug_log()
+{
+    strDate=$(date)
+    echo "${strDate}:${1}"
+}
+
+init_log_file
+
+get_bottle_path_by_process_id()
+{
+    PID_LIST="$1"
+    PREFIX_LIST=""
+
+    for pid_var in $PID_LIST ; do
+        WINE_PREFIX=$(get_prefix_by_pid $pid_var)
+        #去掉重复项
+        for path in $(echo -e $PREFIX_LIST) ; do
+            if [[ $path == "$WINE_PREFIX" ]]; then
+                WINE_PREFIX=""
+            fi
+        done
+        if [ -d "$WINE_PREFIX" ]; then
+            debug_log_to_file "found $pid_var : $WINE_PREFIX"
+            PREFIX_LIST+="\n$WINE_PREFIX"
+        fi
+    done
+    echo -e $PREFIX_LIST
+}
+
+get_pid_by_process_name()
+{
+    PID_LIST=""
+    for pid_var in $(ps -ef | grep -E -i "$1" | grep -v grep | awk '{print $2}');do
+        #通过判断是否加载wine来判断是不是wine进程
+        if [ -n "$(is_wine_process $pid_var)" ];then
+            PID_LIST+=" $pid_var"
+        fi
+    done
+    echo "$PID_LIST"
+}
+
+get_bottle_path_by_process_name()
+{
+    PID_LIST=$(get_pid_by_process_name $1)
+    debug_log_to_file "get pid list: $PID_LIST"
+    get_bottle_path_by_process_id "$PID_LIST"
+}
+
+get_bottle_path()
+{
+    if [ -z "$1" ];then
+        return 0
+    fi
+
+    if [ -f "$1/user.reg" ]; then
+        realpath "$1"
+        return 0
+    fi
+
+    if [ -f "$WINE_BOTTLE/$1/user.reg" ]; then
+        realpath "$WINE_BOTTLE/$1"
+        return 0
+    fi
+    get_bottle_path_by_process_name "$1"
+}
+
+kill_app()
+{
+    debug_log "try to kill $1"
+    for path in $(get_bottle_path $1); do
+        if [ -n "$path" ];then
+            WINESERVER=$(get_wineserver "$path")
+
+            if [ -f "$WINESERVER" ];then
+                debug_log "kill $path by $WINESERVER"
+                env WINEPREFIX="$path" "$WINESERVER" -k
+            fi
+
+            PID_LIST=$(get_pid_by_process_name "exe|wine")
+            for tag_pid in $PID_LIST; do
+                bottle=$(get_bottle_path_by_process_id "$tag_pid")
+                bottle=${bottle:1}
+                if [ "$path" = "$bottle" ];then
+                    echo "kill $tag_pid for $bottle"
+                    kill -9 $tag_pid
+                fi
+            done
+        fi
+    done
+
+    #Kill defunct process
+    ps -ef | grep -E "$USER.*exe.*<defunct>"
+    ps -ef | grep -E "$USER.*exe.*<defunct>" | grep -v grep | awk '{print $2}' | xargs -i kill -9 {}
+}
+
+get_tray_window()
+{
+    $SHELL_DIR/spark_get_tray_window | awk -F: '{print $2}'
+}
+
+get_stacking_window()
+{
+    xprop -root _NET_CLIENT_LIST_STACKING | awk -F# '{print $2}' | sed -e 's/, / /g'
+}
+
+get_window_pid()
+{
+    for winid in $(echo "$1" | sed -e 's/ /\n/g') ;
+    do
+        xprop -id $winid _NET_WM_PID | awk -F= '{print $2}'
+    done
+}
+
+get_window_bottle()
+{
+    debug_log_to_file "get_window_bottle $1"
+    PID_LIST=$(get_window_pid "$1")
+    debug_log_to_file "get_window_bottle pid list: $PID_LIST"
+    get_bottle_path_by_process_id "$PID_LIST"
+}
+
+get_active_bottles()
+{
+    TRAYWINDOWS=$(get_tray_window)
+    STACKINGWINDOWS=$(get_stacking_window)
+    debug_log_to_file "tray window id: $TRAYWINDOWS"
+    debug_log_to_file "stacking window id: $STACKINGWINDOWS"
+    PID_LIST="$TRAYWINDOWS $STACKINGWINDOWS"
+    get_window_bottle "$PID_LIST"
+}
+
+kill_exit_block_app()
+{
+    TAGBOTTLE=$(get_bottle_path $1)
+    debug_log "tag bottle: $TAGBOTTLE"
+    ACTIVEBOTTLES=$(get_active_bottles)
+    debug_log "active bottles: $ACTIVEBOTTLES"
+
+    if [[ "$ACTIVEBOTTLES" != *"$TAGBOTTLE"* ]]; then
+         kill_app "$TAGBOTTLE"
+    fi
+}
+
+#get_active_bottles
+#exit
+
+debug_log "kill $1 $2"
+
+if [ -n "$1" ]; then
+    APP_NAME="$1"
+fi
+
+if [ "$2" = "block" ]; then
+    kill_exit_block_app $APP_NAME $3
+else
+    kill_app $APP_NAME
+fi

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

@@ -9,6 +9,10 @@
 #   Modifier:   shenmo <shenmo@spark-app.store>
 #		   
 #
+
+source /opt/durapps/transhell/transhell.sh
+load_transhell_debug
+
 WINEPREFIX="$HOME/.deepinwine/@public_bottle_name@"
 APPDIR="/opt/deepinwine/apps/@public_bottle_name@"
 APPVER="@deb_version_string@"
@@ -130,7 +134,7 @@ CallProcess()
     is_autostart $DEB_PACKAGE_NAME
     autostart=$?
     if [ $autostart -ne 0 ];then
-        $SHELL_DIR/kill.sh "$BOTTLENAME" block
+        $SHELL_DIR/spark_kill.sh "$BOTTLENAME" block
     fi
 
     #change current dir to excute path
@@ -142,9 +146,22 @@ 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
+    # Link to Document
+if [ -L "$WINEPREFIX/drive_c/users/$(logname)/My Documents" ]; then
+        env WINEPREFIX="$WINEPREFIX" $WINE_CMD reg add 'HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Explorer\User Shell Folders' /t REG_EXPAND_SZ  /v Personal /d "%USERPROFILE%\My Documents" /f
+
+else
+        env WINEPREFIX="$WINEPREFIX" $WINE_CMD reg add 'HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Explorer\User Shell Folders' /t REG_EXPAND_SZ  /v Personal /d "%USERPROFILE%\Documents" /f
+
+fi
+    
+
+    
+    
     debug_log_to_file "Starting process $* ..."
+
 	#############  WARNING: Here is the modified content: Now will run set-dwine-scale.sh
 	/opt/durapps/spark-dwine-helper/scale-set-helper/set-wine-scale.sh "$WINEPREFIX"
     env WINEPREFIX="$WINEPREFIX" $WINE_CMD "$@" &
@@ -159,6 +176,46 @@ CallProcess()
 ###有设置mimetype和自动启动(这个暂时没分析)的功能
 
 ###########专属优化段：
+CallSpark-MailMaster()
+{
+CallProcess "$@"
+sleep 2
+/opt/apps/com.163.dashi.mailmaster.spark/files/disable_mailmaster_shadows
+}
+
+CallSpark-CloudMusic()
+{
+CallProcess "$@"
+sleep 2
+/opt/apps/com.163.music.spark/files/disable_cloudmusic_shadows
+}
+
+CalleCloud()
+{
+    DisableWrite ${WINEPREFIX}/drive_c/users/${USER}/Temp
+    CallProcess "$@"
+}
+
+CallQQMusic()
+{
+    if [ -e ${WINEPREFIX}/drive_c/Program\ Files/Tencent/QQMusic/QQMusic.exe ]; then
+    sleep 1
+    rm -rf ${WINEPREFIX}/drive_c/Program\ Files/Tencent/QQMusic/*.log
+    else
+       mkdir ${WINEPREFIX}/drive_c/Program\ Files/Tencent/updatetemp
+       mv ${WINEPREFIX}/drive_c/Program\ Files/Tencent/QQMusic/*.dll ${WINEPREFIX}/drive_c/Program\ Files/Tencent/updatetemp
+       mv ${WINEPREFIX}/drive_c/Program\ Files/Tencent/QQMusic/*.exe ${WINEPREFIX}/drive_c/Program\ Files/Tencent/updatetemp
+       mv ${WINEPREFIX}/drive_c/Program\ Files/Tencent/QQMusic/*.rdb ${WINEPREFIX}/drive_c/Program\ Files/Tencent/updatetemp
+       mv ${WINEPREFIX}/drive_c/Program\ Files/Tencent/QQMusic/*.log ${WINEPREFIX}/drive_c/Program\ Files/Tencent/updatetemp
+       mv ${WINEPREFIX}/drive_c/Program\ Files/Tencent/QQMusic/QQMusic* ${WINEPREFIX}/drive_c/Program\ Files/Tencent
+       rm -rf ${WINEPREFIX}/drive_c/Program\ Files/Tencent/QQMusic
+       rm -rf ${WINEPREFIX}/drive_c/Program\ Files/Tencent/updatetemp
+       rm -rf ${WINEPREFIX}/drive_c/Program\ Files/Tencent/*.log
+       mv ${WINEPREFIX}/drive_c/Program\ Files/Tencent/QQMusic* ${WINEPREFIX}/drive_c/Program\ Files/Tencent/QQMusic
+    fi
+    CallProcess "$@"
+}
+
 CallDouyin()
 {
     if [ -f "${WINEPREFIX}/drive_c/users/${USER}/Application Data/douyin" ]; then
@@ -209,7 +266,7 @@ CallZhuMu()
 CallQQGame()
 {
     debug_log "run $1"
-    $SHELL_DIR/kill.sh qqgame block
+    $SHELL_DIR/spark_kill.sh qqgame block
     env WINEPREFIX="$WINEPREFIX" $WINE_CMD "$1" &
 }
 
@@ -296,7 +353,7 @@ CallWXWork()
 CallDingTalk()
 {
     debug_log "run $1"
-    $SHELL_DIR/kill.sh DingTalk block
+    $SHELL_DIR/spark_kill.sh DingTalk block
 
     CallProcess "$@"
 }
@@ -359,7 +416,7 @@ CallFoxmail()
 
 CallTHS()
 {
-    $SHELL_DIR/kill.sh ths block
+    $SHELL_DIR/spark_kill.sh ths block
 
     debug_log "Start run $1"
     #get file full path
@@ -369,7 +426,7 @@ CallTHS()
 
     #kill bloack process
     name="${path##*/}"
-    $SHELL_DIR/kill.sh "$name" block
+    $SHELL_DIR/spark_kill.sh "$name" block
 
     #change current dir to excute path
     path=$(dirname "$path")
@@ -387,10 +444,12 @@ CallTHS()
 CallQQGameV2()
 {
     debug_log "run $1"
-    $SHELL_DIR/kill.sh QQMicroGameBox block
+    $SHELL_DIR/spark_kill.sh QQMicroGameBox block
     CallProcess "$1" -action:force_download -appid:${2} -pid:8 -bin_version:1.1.2.4 -loginuin: 
 }
 
+
+
 CallPsCs6()
 {
     #get file full path
@@ -400,7 +459,7 @@ CallPsCs6()
 
     #kill bloack process
     name="${path##*/}"
-    $SHELL_DIR/kill.sh "$name" block
+    $SHELL_DIR/spark_kill.sh "$name" block
 
     #change current dir to excute path
     path=$(dirname "$path")
@@ -417,13 +476,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,7 +513,7 @@ CallApp()
         "Deepin-ZhuMu")
             CallZhuMu "$@"
             ;;
-        "Deepin-QQ"|"Wine-QQ"|"Spark-QQ")
+        "Deepin-QQ"|"Wine-QQ"|"Spark-QQ"|"Deepin-QQ-Spark")
             CallQQ "$@"
             ;;
         "Deepin-TIM"|"Spark-TIM")
@@ -452,7 +528,7 @@ CallApp()
         "Deepin-WeChat")
             CallWeChat "$@"
             ;;
-        "Deepin-WXWork"|"Spark-WeCom")
+        "Deepin-WXWork"|"Spark-WeCom"|"wxwork-spark-uk")
             CallWXWork "$@"
             ;;
         "Deepin-Dding")
@@ -497,10 +573,25 @@ CallApp()
         "Spark-flyele")
             CallFlyele "$@"
             ;;
-	    "Spark-douyin")
+	 "Spark-douyin")
             CallDouyin "$@"
             ;;
-        *)
+	 "Spark-ecloud")
+            CalleCloud "$@"
+            ;;
+	 "IE8")
+            CallIE8 "$@"
+            ;;
+	 "Spark-QQMusic")
+            CallQQMusic "$@"
+            ;;
+	 "Spark-CloudMusic")
+            CallSpark-CloudMusic "$@" "$@"
+            ;;
+	 "Spark-MailMaster")
+            CallSpark-MailMaster "$@"
+            ;;
+        *)        
             CallProcess "$@"
             ;;
     esac
@@ -508,7 +599,7 @@ CallApp()
 ExtractApp()
 {
 	mkdir -p "$1"
-	7z x "$APPDIR/$APPTAR" -o"$1"
+	7z x "$APPDIR/$APPTAR" -o"$1" -bsp1 -bb1 -bse2 | grep --line-buffered -oP "(\d+(\.\d+)?(?=%))" |   zenity --progress --title="$BOTTLENAME" --text="${TRANSHELL_CONTENT_UNPACKING} $BOTTLENAME..."  --width=400 --auto-close --no-cancel
 	mv "$1/drive_c/users/@current_user@" "$1/drive_c/users/$USER"
 	sed -i "s#@current_user@#$USER#" $1/*.reg
     FixLink
@@ -553,7 +644,7 @@ UpdateApp()
     esac
 
 	ExtractApp "${WINEPREFIX}.tmpdir"
-	$SHELL_DIR/updater -s "${WINEPREFIX}.tmpdir" -c "${WINEPREFIX}" -v
+	$SHELL_DIR/spark_updater -s "${WINEPREFIX}.tmpdir" -c "${WINEPREFIX}" -v
 
 
 	rm -rf "${WINEPREFIX}.tmpdir"
@@ -568,9 +659,9 @@ RunApp()
         exit 0
     fi
  	if [ -d "$WINEPREFIX" ]; then
-        UpdateApp | progressbar "$BOTTLENAME" "更新$BOTTLENAME中..."
+        UpdateApp
  	else
-        DeployApp | progressbar $BOTTLENAME "初始化$BOTTLENAME中..."
+        DeployApp 
  	fi
 
     CallApp "$@"
@@ -589,32 +680,24 @@ 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
 }
 
 init_log_file
 
-# Check if some visual feedback is possible
-if command -v zenity >/dev/null 2>&1; then
-	progressbar()
-	{
-		WINDOWID="" zenity --progress --title="$1" --text="$2" --pulsate --width=400 --auto-close --no-cancel ||
-		WINDOWID="" zenity --progress --title="$1" --text="$2" --pulsate --width=400 --auto-close
-	}
-
-else
-	progressbar()
-	{
-		cat -
-	}
-fi
 
 
-#####准备启动进程，分析在 https://shenmo7192.gitee.io/post/deepin-wine6%E7%9A%84run_v4%E8%84%9A%E6%9C%AC%E6%8E%A2%E7%B4%A2%E5%90%AF%E5%8A%A8%E6%96%B9%E5%BC%8F/
+
+
+#####准备启动进程，分析在 https://blog.shenmo.tech/post/deepin-wine6%E7%9A%84run_v4%E8%84%9A%E6%9C%AC%E6%8E%A2%E7%B4%A2%E5%90%AF%E5%8A%A8%E6%96%B9%E5%BC%8F/
 if [ $# -lt 3 ]; then
     debug_log "参数个数小于3个"
     exit 0

spark-dwine-helper/s-wine-helper/deepinwine/tools/spark_updater

@@ -0,0 +1,42 @@
+#!/bin/bash
+
+# 检查是否提供了-c和-s选项
+if [[ ! "$*" =~ "-c" ]] || [[ ! "$*" =~ "-s" ]]; then
+  echo "用法: updater -c <目标目录> -s <源目录> [-v]"
+  exit 1
+fi
+
+# 解析命令行参数
+while getopts ":c:s:v" opt; do
+  case $opt in
+    c)
+      destination_dir=$OPTARG
+      ;;
+    s)
+      source_dir=$OPTARG
+      ;;
+    v)
+      verbose=true
+      ;;
+    \?)
+      echo "无效选项: -$OPTARG" >&2
+      exit 1
+      ;;
+    :)
+      echo "选项 -$OPTARG 需要一个参数." >&2
+      exit 1
+      ;;
+  esac
+done
+
+# 从源目录复制文件到目标目录
+if [ "$verbose" = true ]; then
+  echo "正在从 $source_dir 复制文件到 $destination_dir"
+fi
+
+# 使用cp命令覆盖同名文件
+cp -rf "$source_dir"/* "$destination_dir"
+
+echo "文件复制完成！"
+exit 0
+

spark-dwine-helper/s-wine-helper/deepinwine/tools/transhell/spark_run_v4.sh_en_US.transhell

@@ -0,0 +1,2 @@
+#!/bin/bash
+TRANSHELL_CONTENT_UNPACKING="Unpacking"

spark-dwine-helper/s-wine-helper/deepinwine/tools/transhell/spark_run_v4.sh_zh_CN.transhell

@@ -0,0 +1,2 @@
+#!/bin/bash
+TRANSHELL_CONTENT_UNPACKING="解包"

spark-dwine-helper/s-wine-helper/durapps/spark-dwine-helper/scale-set-helper/get-scale.sh

@@ -1,4 +1,7 @@
 #/bin/bash
+source /opt/durapps/transhell/transhell.sh
+load_transhell_debug
+
 #########>>>>>>>函数段
 Get_Dist_Name()
 {
@@ -55,8 +58,8 @@ dimensions=`xdpyinfo | grep dimensions | sed -r 's/^[^0-9]*([0-9]+x[0-9]+).*$/\1
 scale_factor=`zenity --list \
 	--width=700 \
 	--height=350 \
-       --title="您的分辨率是：$dimensions，请在以下选项中选择一个以运行应用" \
-       --column="缩放倍率" \
+       --title="${TRANSHELL_CONTENT_YOUR_DIMENSION_IS} $dimensions ${TRANSHELL_CONTENT_PLEASE_CHOOSE_ONE_BELOW}" \
+       --column="${TRANSHELL_CONTENT_OPTION}" \
        1.0 \
        1.25 \
 	1.5 \
@@ -65,11 +68,11 @@ scale_factor=`zenity --list \
 
 case "$scale_factor" in 
 	"")
-	zenity --info --text="默认为1倍缩放。您可以使用星火wine助手设置来重新设置" --width=500 --height=150
+	zenity --info --text="${TRANSHELL_CONTENT_1_SCALE_AS_DEFAULT}${TRANSHELL_CONTENT_YOU_CAN_USE_SPARK_WINE_HELPER_SETTINGS_TO_ADJUST}" --width=500 --height=150
 	scale_factor="1.0"
 	;;
 	*)
-zenity --info --text="缩放倍数为$scale_factor。已保存！您可以使用星火wine助手设置来重新设置" --width=500 --height=150
+zenity --info --text="${TRANSHELL_CONTENT_SCALE_IS} $scale_factor ${TRANSHELL_CONTENT_SAVED}！${TRANSHELL_CONTENT_YOU_CAN_USE_SPARK_WINE_HELPER_SETTINGS_TO_ADJUST}" --width=500 --height=150
 	;;
 esac
 echo "$scale_factor" > $HOME/.config/spark-wine/scale.txt

spark-dwine-helper/s-wine-helper/durapps/spark-dwine-helper/scale-set-helper/transhell/get-scale.sh_en_US.transhell

@@ -0,0 +1,8 @@
+#!/bin/bash
+TRANSHELL_CONTENT_OPTION="Options"
+TRANSHELL_CONTENT_YOUR_DIMENSION_IS="Your dimension is ："
+TRANSHELL_CONTENT_PLEASE_CHOOSE_ONE_BELOW="Please choose one option below"
+TRANSHELL_CONTENT_1_SCALE_AS_DEFAULT="Setting 1.0 scale as default"
+TRANSHELL_CONTENT_SCALE_IS="Scale multiple is "
+TRANSHELL_CONTENT_SAVED="saved."
+TRANSHELL_CONTENT_YOU_CAN_USE_SPARK_WINE_HELPER_SETTINGS_TO_ADJUST="You can use spark wine helper settings to adjust settings"

spark-dwine-helper/s-wine-helper/durapps/spark-dwine-helper/scale-set-helper/transhell/get-scale.sh_zh_CN.transhell

@@ -0,0 +1,8 @@
+#!/bin/bash
+TRANSHELL_CONTENT_OPTION="选项"
+TRANSHELL_CONTENT_YOUR_DIMENSION_IS="您的分辨率是："
+TRANSHELL_CONTENT_PLEASE_CHOOSE_ONE_BELOW="请在以下选项中选择一个"
+TRANSHELL_CONTENT_1_SCALE_AS_DEFAULT="默认为1倍缩放。"
+TRANSHELL_CONTENT_SCALE_IS="缩放倍数为"
+TRANSHELL_CONTENT_SAVED="已保存"
+TRANSHELL_CONTENT_YOU_CAN_USE_SPARK_WINE_HELPER_SETTINGS_TO_ADJUST="您可以使用星火wine助手设置来重新设置"

spark-dwine-helper/spark-dwine-helper-settings/opt/durapps/spark-dwine-helper/spark-dwine-helper-settings/settings.sh

@@ -1,30 +1,32 @@
 #/bin/bash
 
+source /opt/durapps/transhell/transhell.sh
+load_transhell_debug
 
 until [ "$IS_CLOSE" = "1" ];do
 
 CHOSEN_SETTINGS=`zenity --list \
 	--width=700 \
 	--height=350 \
-       --title="欢迎使用星火wine助手控制中心，请在以下选项中选择一个执行！" \
-       --column="操作" \
-	设置全局缩放 \
-       设置单独应用缩放 \
-	一键将所有已安装应用的缩放设置改为与全局缩放一致 \
-	备注：以上操作仅对使用了spark-dwine-helper的应用生效 `
+       --title="${TRANSHELL_CONTENT_WELCOME_AND_CHOOSE_ONE_TO_RUN}" \
+       --column="${TRANSHELL_CONTENT_OPTION}" \
+	"${TRANSHELL_CONTENT_SET_GLOBAL_SCALE}" \
+       "${TRANSHELL_CONTENT_SET_APP_SCALE}" \
+	"${TRANSHELL_CONTENT_SYNC_APP_SCALE_WITH_GLOBAL}" \
+	"${TRANSHELL_CONTENT_ONLY_AVAILABLE_TO_SPARK_DWINE_HELPER_APP}" `
 
 echo "$CHOSEN_SETTINGS"
 case "$CHOSEN_SETTINGS" in 
-	"设置全局缩放")
+	"${TRANSHELL_CONTENT_SET_GLOBAL_SCALE}")
 ########
-	zenity --info --text="请注意：此选项对deepin/UOS无效，会优先读取deepin/UOS的缩放设置进行缩放" --width=500 --height=150
+	zenity --info --text="${TRANSHELL_CONTENT_THIS_WILL_NOT_TAKE_EFFECT_IN_DEEPIN_BECAUSE_READ_ENVIRONMENT_FIRST}" --width=500 --height=150
 
 dimensions=`xdpyinfo | grep dimensions | sed -r 's/^[^0-9]*([0-9]+x[0-9]+).*$/\1/'`
 scale_factor=`zenity --list \
 	--width=700 \
 	--height=350 \
-       --title="您的分辨率是：$dimensions，请在以下选项中选择一个" \
-       --column="缩放倍率" \
+       --title="${TRANSHELL_CONTENT_YOUR_DIMENSION_IS} $dimensions ${TRANSHELL_CONTENT_PLEASE_CHOOSE_ONE_BELOW}" \
+       --column="${TRANSHELL_CONTENT_OPTION}" \
        1.0 \
        1.25 \
 	1.5 \
@@ -33,11 +35,11 @@ scale_factor=`zenity --list \
 
 case "$scale_factor" in 
 	"")
-	zenity --info --text="默认为1倍缩放。" --width=500 --height=150
+	zenity --info --text="${TRANSHELL_CONTENT_1_SCALE_AS_DEFAULT}" --width=500 --height=150
 	scale_factor="1.0"
 	;;
 	*)
-zenity --info --text="缩放倍数为$scale_factor。已保存！" --width=500 --height=150
+zenity --info --text="${TRANSHELL_CONTENT_SCALE_IS} $scale_factor ${TRANSHELL_CONTENT_SAVED}" --width=500 --height=150
 	;;
 esac
 echo "$scale_factor" > $HOME/.config/spark-wine/scale.txt
@@ -49,12 +51,12 @@ echo "$scale_factor" > $HOME/.config/spark-wine/scale.txt
 
 
 
-	"设置单独应用缩放")
-	zenity --info --text="请在接下来的文件选择框选中所需的应用所在的容器文件夹（注意要选择文件夹）" --width=500 --height=150
+	"${TRANSHELL_CONTENT_SET_APP_SCALE}")
+	zenity --info --text="${TRANSHELL_CONTENT_PLEASE_CHOOSE_WINE_BOTTLE_DIRECTORY}" --width=500 --height=150
 	CONTAINER_PATH=`zenity --file-selection --filename="$HOME/.deepinwine/" --directory`
 	
 	if [ ! -f "$CONTAINER_PATH/user.reg" ];then
-	zenity --info --text="错误：找不到user.reg.这不是一个wine容器" --width=500 --height=150
+	zenity --info --text="${TRANSHELL_CONTENT_ERROR_NO_USER_REG_AS_NOT_A_WINE_BOTTLE}" --width=500 --height=150
 	
 	else
 	
@@ -62,27 +64,27 @@ echo "$scale_factor" > $HOME/.config/spark-wine/scale.txt
 scale_factor=`zenity --list \
 	--width=700 \
 	--height=350 \
-       --title="您的分辨率是：$dimensions，请在以下选项中选择一个" \
-       --column="缩放倍率" \
+       --title="${TRANSHELL_CONTENT_YOUR_DIMENSION_IS} $dimensions ${TRANSHELL_CONTENT_PLEASE_CHOOSE_ONE_BELOW}" \
+       --column="${TRANSHELL_CONTENT_OPTION}" \
        1.0 \
        1.25 \
 	1.5 \
 	1.75 \
        2.0 \
-	与全局设置同步 `
+	${TRANSHELL_CONTENT_SYNC_SCALE_WITH_GLOBAL} `
 
 case "$scale_factor" in 
 	"")
-	zenity --info --text="默认为1倍缩放。" --width=500 --height=150
+	zenity --info --text="${TRANSHELL_CONTENT_1_SCALE_AS_DEFAULT}。" --width=500 --height=150
 	scale_factor="1.0"
 /opt/durapps/spark-dwine-helper/scale-set-helper/set-wine-scale.sh -s $scale_factor $CONTAINER_PATH
 	;;
-	"与全局设置同步")
-	zenity --info --text="将会与全局设置同步" --width=500 --height=150
+	"${TRANSHELL_CONTENT_SYNC_SCALE_WITH_GLOBAL}")
+	zenity --info --text="${TRANSHELL_CONTENT_WILL_SYNC_SCALE_WITH_GLOBAL}" --width=500 --height=150
 	rm $CONTAINER_PATH/scale.txt
 	;;
 	*)
-zenity --info --text="缩放倍数为$scale_factor。已保存！" --width=500 --height=150
+zenity --info --text="${TRANSHELL_CONTENT_SCALE_IS} $scale_factor ${TRANSHELL_CONTENT_SAVED}" --width=500 --height=150
 /opt/durapps/spark-dwine-helper/scale-set-helper/set-wine-scale.sh -s $scale_factor $CONTAINER_PATH
 	;;
 esac
@@ -90,11 +92,11 @@ esac
 
 fi
 	;;
-	"一键将所有已安装应用的缩放设置改为与全局缩放一致")
+	"${TRANSHELL_CONTENT_SYNC_APP_SCALE_WITH_GLOBAL}")
 	find ${HOME}/.deepinwine/ -name "scale.txt" -type f -print -exec rm -rf {} \;
-	zenity --info --text="以下容器中的应用的缩放设置已与全局设置同步：\n`cd ${HOME}/.deepinwine/ && ls`" --width=500 --height=150
+	zenity --info --text="${TRANSHELL_CONTENT_BOTTLES_BELOW_HAVE_SYNCED_SCALE_WITH_GLOBAL}：\n`cd ${HOME}/.deepinwine/ && ls`" --width=500 --height=150
 	;;
-	"以上操作仅对使用了spark-dwine-helper的应用生效")
+	"${TRANSHELL_CONTENT_ONLY_AVAILABLE_TO_SPARK_DWINE_HELPER_APP}")
 	
 	;;
 
@@ -104,4 +106,4 @@ fi
 
 
 esac
-done
+done

spark-dwine-helper/spark-dwine-helper-settings/opt/durapps/spark-dwine-helper/spark-dwine-helper-settings/transhell/settings.sh_en_US.transhell

@@ -0,0 +1,18 @@
+#!/bin/bash
+TRANSHELL_CONTENT_WELCOME_AND_CHOOSE_ONE_TO_RUN="Welcome to spark wine helper settings，Please choose one option below to excute"
+TRANSHELL_CONTENT_OPTION="Options"
+TRANSHELL_CONTENT_SET_GLOBAL_SCALE="Set global scale"
+TRANSHELL_CONTENT_SET_APP_SCALE="Set app scale"
+TRANSHELL_CONTENT_SYNC_APP_SCALE_WITH_GLOBAL="Sync all the wine app scale with global scale in one key"
+TRANSHELL_CONTENT_ONLY_AVAILABLE_TO_SPARK_DWINE_HELPER_APP="Note: The options above only take effect on spark-dwine-helper apps"
+TRANSHELL_CONTENT_THIS_WILL_NOT_TAKE_EFFECT_IN_DEEPIN_BECAUSE_READ_ENVIRONMENT_FIRST="Note：This option is invalid in deepin/UOS,for the script will read deepin/UOS scale settings first"
+TRANSHELL_CONTENT_YOUR_DIMENSION_IS="Your dimension is ："
+TRANSHELL_CONTENT_PLEASE_CHOOSE_ONE_BELOW="Please choose one option below"
+TRANSHELL_CONTENT_1_SCALE_AS_DEFAULT="Setting 1.0 scale as default"
+TRANSHELL_CONTENT_SCALE_IS="Scale multiple is "
+TRANSHELL_CONTENT_SAVED="saved."
+TRANSHELL_CONTENT_PLEASE_CHOOSE_WINE_BOTTLE_DIRECTORY="Please choose the directory the app you want to adjust in（Please choose DIRECTORY instead of file）"
+TRANSHELL_CONTENT_ERROR_NO_USER_REG_AS_NOT_A_WINE_BOTTLE="E：user.reg can not be found.This is not a wine bottle"
+TRANSHELL_CONTENT_SYNC_SCALE_WITH_GLOBAL="Sync with global scale settings"
+TRANSHELL_CONTENT_WILL_SYNC_SCALE_WITH_GLOBAL="Will sync with global scale settings"
+TRANSHELL_CONTENT_BOTTLES_BELOW_HAVE_SYNCED_SCALE_WITH_GLOBAL="The scale settings of apps in bottle below is already syncd with global scale settings"

spark-dwine-helper/spark-dwine-helper-settings/opt/durapps/spark-dwine-helper/spark-dwine-helper-settings/transhell/settings.sh_zh_CN.transhell

@@ -0,0 +1,18 @@
+#!/bin/bash
+TRANSHELL_CONTENT_WELCOME_AND_CHOOSE_ONE_TO_RUN="欢迎使用星火wine助手控制中心，请在以下选项中选择一个执行！"
+TRANSHELL_CONTENT_OPTION="选项"
+TRANSHELL_CONTENT_SET_GLOBAL_SCALE="设置全局缩放"
+TRANSHELL_CONTENT_SET_APP_SCALE="设置单独应用缩放"
+TRANSHELL_CONTENT_SYNC_APP_SCALE_WITH_GLOBAL="一键将所有已安装应用的缩放设置改为与全局缩放一致"
+TRANSHELL_CONTENT_ONLY_AVAILABLE_TO_SPARK_DWINE_HELPER_APP="备注：以上操作仅对使用了spark-dwine-helper的应用生效"
+TRANSHELL_CONTENT_THIS_WILL_NOT_TAKE_EFFECT_IN_DEEPIN_BECAUSE_READ_ENVIRONMENT_FIRST="请注意：此选项对deepin/UOS无效，会优先读取deepin/UOS的缩放设置进行缩放"
+TRANSHELL_CONTENT_YOUR_DIMENSION_IS="您的分辨率是："
+TRANSHELL_CONTENT_PLEASE_CHOOSE_ONE_BELOW="请在以下选项中选择一个"
+TRANSHELL_CONTENT_1_SCALE_AS_DEFAULT="默认为1倍缩放。"
+TRANSHELL_CONTENT_SCALE_IS="缩放倍数为"
+TRANSHELL_CONTENT_SAVED="已保存"
+TRANSHELL_CONTENT_PLEASE_CHOOSE_WINE_BOTTLE_DIRECTORY="请在接下来的文件选择框选中所需的应用所在的容器文件夹（注意要选择文件夹）"
+TRANSHELL_CONTENT_ERROR_NO_USER_REG_AS_NOT_A_WINE_BOTTLE="错误：找不到user.reg.这不是一个wine容器"
+TRANSHELL_CONTENT_SYNC_SCALE_WITH_GLOBAL="与全局设置同步"
+TRANSHELL_CONTENT_WILL_SYNC_SCALE_WITH_GLOBAL="将会与全局设置同步"
+TRANSHELL_CONTENT_BOTTLES_BELOW_HAVE_SYNCED_SCALE_WITH_GLOBAL="以下容器中的应用的缩放设置已与全局设置同步"

spark-dwine-helper/spark-dwine-helper-settings/usr/share/applications/spark-dwine-helper-settings.desktop

@@ -1,7 +1,7 @@
 [Desktop Entry]
 Categories=Utility;
 Encoding=UTF-8
-Exec=sh -c "/opt/durapps/spark-dwine-helper/spark-dwine-helper-settings/settings.sh"
+Exec=bash -c "/opt/durapps/spark-dwine-helper/spark-dwine-helper-settings/settings.sh"
 Icon=spark-dwine-helper-settings
 MimeType=
 Name=Spark Wine Helper Settings

spark-dwine-launch/postinst_template

@@ -0,0 +1,40 @@
+#!/bin/bash
+
+PACK_NAME="" #软件包名
+BOTTLE_NAME="" #容器名
+ACTIVEX_NAME=""
+MAKE_AUTOSTART="" #若需要开机自启，则填写1
+
+
+make_autostart()
+{
+    for username in $(ls /home)
+    do
+        echo /home/$username
+        if [ -d "/home/$username/.config/autostart" ]
+        then
+            cp /opt/apps/$PACK_NAME/entries/applications/$PACK_NAME.desktop /home/$username/.config/autostart/
+            sed -i "s#%u#\"autostart\"#" /home/$username/.config/autostart/$PACK_NAME.desktop
+        fi
+    done
+}
+
+
+
+if [ -n "$MAKE_AUTOSTART" ]; then
+    make_autostart
+fi
+
+
+
+if [ -n "$ACTIVEX_NAME" ]; then
+    if [ ! -d "/usr/lib/mozilla/plugins" ];then
+        mkdir -p /usr/lib/mozilla/plugins
+    fi
+    cp /usr/local/share/pipelight/libpipelight.so /usr/lib/mozilla/plugins/libpipelight-$ACTIVEX_NAME.so
+fi
+
+# Make sure the script returns 0
+true
+
+

spark-dwine-launch/postrm_template

@@ -0,0 +1,58 @@
+#!/bin/bash
+if [ "$1" = "remove" ] || [ "$1" = "purge" ];then
+
+echo "清理卸载残留"
+BOTTLE_NAME="" #在引号中填写容器名
+PACK_NAME=""   #在引号中填写软件包名
+ACTIVEX_NAME="" #activex相关，若未使用，可不设置
+MAKE_AUTOSTART="" #如果先前设置了开机自启，则在此处填写1
+
+
+
+### 以下为功能段，若只用于打包则以下内容可不看，只填写上方即可
+
+make_autostart()
+{
+for username in $(ls /home)  
+    do
+      echo /home/$username
+        if [ -d "/home/$username/.config/autostart" ]
+        then
+            rm /home/$username/.config/autostart/$PACK_NAME.desktop
+        fi
+    done
+}
+
+
+
+if [ -n "$MAKE_AUTOSTART" ]; then
+    make_autostart
+fi
+
+
+if [ -n "$ACTIVEX_NAME" ]; then
+    rm /usr/lib/mozilla/plugins/libpipelight-$ACTIVEX_NAME.so
+fi
+
+
+if [ -z $BOTTLE_NAME ];then
+echo "W: 没有指定容器，跳过清理容器。请手动前往 ~/.deepinwine/ 下删除"
+exit
+fi
+
+if [ -e /opt/deepinwine/tools/spark_kill.sh ];then
+/opt/deepinwine/tools/spark_kill.sh $BOTTLE_NAME
+###这里注意，如果没写BOTTLE_NAME,会把QQ杀了
+fi
+
+for username in $(ls /home)  
+    do
+      echo /home/$username
+        if [ -d /home/$username/.deepinwine/$BOTTLE_NAME ]  
+        then
+        rm -rf /home/$username/.deepinwine/$BOTTLE_NAME
+        fi
+    done
+else
+echo "非卸载，跳过清理"
+fi

spark-dwine-launch/run-template_v1.sh

@@ -79,7 +79,7 @@ fi
 
 ##############<<<<<<<<<屏蔽mono和gecko安装器开始
 ##默认屏蔽mono和gecko安装器
-if [ "$APPRUN_CMD" = "spark-wine7-devel" ] && [ -z "$ENABLE_DOT_NET"];then
+if [ "$APPRUN_CMD" = "spark-wine7-devel" ] || [ "$APPRUN_CMD" = "spark-wine8" ] && [ -z "$ENABLE_DOT_NET" ];then
 
 export WINEDLLOVERRIDES="mscoree,mshtml="
 #### "为了降低打包体积，默认关闭gecko和momo，如有需要，注释此行（仅对spark-wine7-devel有效）"