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

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

spark-dwine-helper/build.sh

@@ -28,7 +28,7 @@ Installed-Size: $SIZE
 Depends: zenity, p7zip-full, fonts-noto-cjk,transhell
 Section: utils
 Priority: extra
-Recommends: spark-dwine-helper-settings,deepin-wine-helper(>=5.1) | com.wine-helper.deepin
+Recommends: spark-dwine-helper-settings
 Multi-Arch: foreign
 Provides: store.spark-app.spark-dwine-helper(=$version)
 Replaces: store.spark-app.spark-dwine-helper(<=$version)
@@ -88,7 +88,7 @@ Installed-Size: $SIZE
 Depends: zenity, p7zip-full, fonts-noto-cjk,transhell
 Section: utils
 Priority: extra
-Recommends: spark-dwine-helper-settings,deepin-wine-helper(>=5.1) | com.wine-helper.deepin
+Recommends: spark-dwine-helper-settings
 Provides: spark-dwine-helper(=$version)
 Conflicts: spark-dwine-helper
 Replaces: spark-dwine-helper(<=$version)
@@ -112,11 +112,11 @@ SIZE=`echo ${SIZE%%.*}`
 
 cat  << EOF >pkg/DEBIAN/control
 Package: spark-dwine-helper-settings
-Version: 1.3.1
+Version: 1.3.2
 Architecture: all
 Maintainer: shenmo <shenmo@spark-app.store>
 Installed-Size: $SIZE
-Depends: spark-dwine-helper(>=1.6),transhell
+Depends: spark-dwine-helper(>=1.6),transhell,zenity
 Section: utils
 Priority: extra
 Multi-Arch: foreign

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

@@ -215,7 +215,7 @@ kill_app()
 
 get_tray_window()
 {
-    $SHELL_DIR/get_tray_window | awk -F: '{print $2}'
+    $SHELL_DIR/spark_get_tray_window | awk -F: '{print $2}'
 }
 
 get_stacking_window()

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

@@ -134,7 +134,7 @@ CallProcess()
     is_autostart $DEB_PACKAGE_NAME
     autostart=$?
     if [ $autostart -ne 0 ];then
-        $SHELL_DIR/kill_spark.sh "$BOTTLENAME" block
+        $SHELL_DIR/spark_kill.sh "$BOTTLENAME" block
     fi
 
     #change current dir to excute path
@@ -148,6 +148,18 @@ CallProcess()
     fi
     # 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
@@ -254,7 +266,7 @@ CallZhuMu()
 CallQQGame()
 {
     debug_log "run $1"
-    $SHELL_DIR/kill_spark.sh qqgame block
+    $SHELL_DIR/spark_kill.sh qqgame block
     env WINEPREFIX="$WINEPREFIX" $WINE_CMD "$1" &
 }
 
@@ -341,7 +353,7 @@ CallWXWork()
 CallDingTalk()
 {
     debug_log "run $1"
-    $SHELL_DIR/kill_spark.sh DingTalk block
+    $SHELL_DIR/spark_kill.sh DingTalk block
 
     CallProcess "$@"
 }
@@ -404,7 +416,7 @@ CallFoxmail()
 
 CallTHS()
 {
-    $SHELL_DIR/kill_spark.sh ths block
+    $SHELL_DIR/spark_kill.sh ths block
 
     debug_log "Start run $1"
     #get file full path
@@ -414,7 +426,7 @@ CallTHS()
 
     #kill bloack process
     name="${path##*/}"
-    $SHELL_DIR/kill_spark.sh "$name" block
+    $SHELL_DIR/spark_kill.sh "$name" block
 
     #change current dir to excute path
     path=$(dirname "$path")
@@ -432,7 +444,7 @@ CallTHS()
 CallQQGameV2()
 {
     debug_log "run $1"
-    $SHELL_DIR/kill_spark.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: 
 }
 
@@ -447,7 +459,7 @@ CallPsCs6()
 
     #kill bloack process
     name="${path##*/}"
-    $SHELL_DIR/kill_spark.sh "$name" block
+    $SHELL_DIR/spark_kill.sh "$name" block
 
     #change current dir to excute path
     path=$(dirname "$path")
@@ -632,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"

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-launch/postrm_template

@@ -40,8 +40,8 @@ echo "W: 没有指定容器，跳过清理容器。请手动前往 ~/.deepinwine
 exit
 fi
 
-if [ -e /opt/deepinwine/tools/kill.sh ];then
-/opt/deepinwine/tools/kill.sh $BOTTLE_NAME
+if [ -e /opt/deepinwine/tools/spark_kill.sh ];then
+/opt/deepinwine/tools/spark_kill.sh $BOTTLE_NAME
 ###这里注意，如果没写BOTTLE_NAME,会把QQ杀了
 fi