修改： spark-dwine-helper/pkg/opt/durapps/spark-dwine-helper/spark-get-scale.sh

修改：     spark-dwine-launch/run-template_v1.sh

spark-dwine-helper/pkg/DEBIAN/control

@@ -1,5 +1,5 @@
 Package: spark-dwine-helper
-Version: 1.5
+Version: 1.5.1
 Architecture: all
 Maintainer: shenmo <shenmo@spark-app.store>
 Installed-Size: 2293

spark-dwine-helper/pkg/opt/deepinwine/tools/spark_run_v4.sh

@@ -8,7 +8,7 @@
 #
 #   Modifier:   shenmo <shenmo@spark-app.store>
 #		   
-#   diff: Now will run set-dwine-scale.sh in stage RunApp before CallApp
+#   diff: Now will run set-dwine-scale.sh in stage CallProcess before CallApp
 #         Deleted Deepin-* to simplify the script
 #
 WINEPREFIX="$HOME/.deepinwine/@public_bottle_name@"
@@ -171,7 +171,8 @@ CallProcess()
     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/set-dwine-scale.sh "$WINEPREFIX"
     env WINEPREFIX="$WINEPREFIX" $WINE_CMD "$@" &
 
     #start autobottle
@@ -377,14 +378,14 @@ CallTHS()
         xdg-mime default "$DEB_PACKAGE_NAME".desktop "$MIME_TYPE"
     fi
 
-    env WINEPREFIX="$WINEPREFIX" $WINE_CMD "$@" &
+    CallProcess "$@"
 }
 
 CallQQGameV2()
 {
     debug_log "run $1"
     $SHELL_DIR/kill.sh QQMicroGameBox block
-    env WINEPREFIX="$WINEPREFIX" $WINE_CMD "$1" -action:force_download -appid:${2} -pid:8 -bin_version:1.1.2.4 -loginuin: &
+    CallProcess "$1" -action:force_download -appid:${2} -pid:8 -bin_version:1.1.2.4 -loginuin: 
 }
 
 CallPsCs6()
@@ -410,7 +411,7 @@ CallPsCs6()
 
     debug_log_to_file "Starting process $* ..."
 
-    env WINEPREFIX="$WINEPREFIX" $WINE_CMD "$@" &
+    CallProcess "$@"
 }
 
 #arg 1: exec file path
@@ -562,8 +563,6 @@ RunApp()
  	else
         DeployApp | progressbar $BOTTLENAME "初始化$BOTTLENAME中..."
  	fi
-#############  WARNING: Here is the modified content: Now will run set-dwine-scale.sh
-	/opt/durapps/spark-dwine-helper/set-dwine-scale.sh "$WINEPREFIX"
 
     CallApp "$@"
 }

spark-dwine-helper/pkg/opt/durapps/spark-dwine-helper/set-dwine-scale.sh

@@ -52,7 +52,7 @@ fi
 if [ "$appointed_scale_factor" = "" ];then
 #########未指定下，读取$CONTAINER_PATH/scale.txt。如果没有，优先$DEEPIN_WINE_SCALE设置，然后是手动
 
-if [ !-f "$CONTAINER_PATH/scale.txt" ];then
+if [ ! -f "$CONTAINER_PATH/scale.txt" ];then
 	
 	echo "E: No SCALE profile found. try to use DEEPIN_WINE_SCALE"
 	echo "错误：没有检测到缩放设置，读取DEEPIN_WINE_SCALE"
@@ -71,11 +71,14 @@ if [ !-f "$CONTAINER_PATH/scale.txt" ];then
 fi
 else
 wine_scale=`cat $CONTAINER_PATH/scale.txt`
+if [ -n "$DEEPIN_WINE_SCALE" ] && [ "$DEEPIN_WINE_SCALE" != "$wine_scale" ];then
+zenity --info --text="检测到您的缩放设置和Deepin默认的不同。这可能是您的个人设置，因此不会自动同步\n您可以删除$CONTAINER_PATH/scale.txt来同步设置" --width=500 --height=150 --timeout=5 &
+fi
 echo "检测到的缩放倍数为:$wine_scale"
 echo "Scale is $wine_scale"
+
+
 fi
-
-
 #####非deepin发行版似乎没有这个变量，暂时不清楚这个变量是哪个组件做的
 
 

spark-dwine-helper/pkg/opt/durapps/spark-dwine-helper/spark-get-scale.sh

@@ -1,4 +1,16 @@
 #/bin/bash
+#########>>>>>>>函数段
+Get_Dist_Name()
+{
+    if grep -Eqii "Deepin" /etc/issue || grep -Eq "Deepin" /etc/*-release; then
+        DISTRO='Deepin'
+    elif grep -Eqi "Uniontech" /etc/issue || grep -Eq "Uniontech" /etc/*-release; then
+        DISTRO='UniontechOS'
+    else
+	 DISTRO='OtherOS'
+	fi
+}
+#########<<<<<<<
 
 if [ $# -lt 1 ]; then
 echo "无参数，无法启动。请参考set-dwine-scale.sh使用"
@@ -54,14 +66,3 @@ esac
 echo "$scale_factor" > $HOME/.config/spark-wine/scale.txt
 cat $HOME/.config/spark-wine/scale.txt > $CONTAINER_PATH/scale.txt
 
-#########>>>>>>>函数段
-Get_Dist_Name()
-{
-    if grep -Eqii "Deepin" /etc/issue || grep -Eq "Deepin" /etc/*-release; then
-        DISTRO='Deepin'
-    elif grep -Eqi "Uniontech" /etc/issue || grep -Eq "Uniontech" /etc/*-release; then
-        DISTRO='UniontechOS'
-    else
-	 DISTRO='OtherOS'
-	fi
-}

spark-dwine-launch/run-template_v1.sh

@@ -14,6 +14,21 @@
 #
 #
 
+#######################函数段。下文调用的额外功能会在此处声明
+
+Get_Dist_Name()
+{
+    if grep -Eqii "Deepin" /etc/issue || grep -Eq "Deepin" /etc/*-release; then
+        DISTRO='Deepin'
+    elif grep -Eqi "Uniontech" /etc/issue || grep -Eq "Uniontech" /etc/*-release; then
+        DISTRO='UniontechOS'
+    else
+	 DISTRO='OtherOS'
+	fi
+}
+
+####获得发行版名称
+
 #########################预设值段
 
 version_gt() { test "$(echo "$@" | tr " " "\n" | sort -V | head -n 1)" != "$1"; }
@@ -79,17 +94,3 @@ else
 fi
 
 
-#######################函数段。上文调用的额外功能会在此处声明
-
-Get_Dist_Name()
-{
-    if grep -Eqii "Deepin" /etc/issue || grep -Eq "Deepin" /etc/*-release; then
-        DISTRO='Deepin'
-    elif grep -Eqi "Uniontech" /etc/issue || grep -Eq "Uniontech" /etc/*-release; then
-        DISTRO='UniontechOS'
-    else
-	 DISTRO='OtherOS'
-	fi
-}
-
-####获得发行版名称