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

重命名：   spark-dwine-helper/pkg/opt/durapps/spark-dwine-helper/spark-get-scale.sh -> spark-dwine-helper/pkg/opt/durapps/spark-dwine-helper/scale-set-helper/get-scale.sh
	重命名：   spark-dwine-helper/pkg/opt/durapps/spark-dwine-helper/set-dwine-scale.sh -> spark-dwine-helper/pkg/opt/durapps/spark-dwine-helper/scale-set-helper/set-wine-scale.sh
	修改：     spark-dwine-helper/spark_run_custom.sh

spark-dwine-helper/pkg/DEBIAN/control

@@ -1,5 +1,5 @@
 Package: spark-dwine-helper
-Version: 1.4.1
+Version: 1.6
 Architecture: all
 Maintainer: shenmo <shenmo@spark-app.store>
 Installed-Size: 2293
@@ -7,5 +7,5 @@ Depends: zenity:amd64, p7zip-full:amd64, fonts-noto-cjk,deepin-wine-helper(>=5.1
 Section: utils
 Priority: extra
 Multi-Arch: foreign
-Homepage: https://www.spark-app.store/
+Homepage: https://gitee.com/deepin-community-store/spark-wine
 Description: Spark Deepin Wine Helper

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

@@ -8,8 +8,6 @@
 #
 #   Modifier:   shenmo <shenmo@spark-app.store>
 #		   
-#   diff: Now will run set-dwine-scale.sh in stage RunApp before CallApp
-#         Deleted Deepin-* to simplify the script
 #
 WINEPREFIX="$HOME/.deepinwine/@public_bottle_name@"
 APPDIR="/opt/deepinwine/apps/@public_bottle_name@"
@@ -35,32 +33,7 @@ if [ $SPECIFY_SHELL_DIR ]; then
     SHELL_DIR=$SPECIFY_SHELL_DIR
 fi
 
-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
-}
-########关于公共文件夹，暂时意义不明
 
 _DeleteRegistry()
 {
@@ -171,7 +144,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/scale-set-helper/set-wine-scale.sh "$WINEPREFIX"
     env WINEPREFIX="$WINEPREFIX" $WINE_CMD "$@" &
 
     #start autobottle
@@ -377,14 +351,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 +384,7 @@ CallPsCs6()
 
     debug_log_to_file "Starting process $* ..."
 
-    env WINEPREFIX="$WINEPREFIX" $WINE_CMD "$@" &
+    CallProcess "$@"
 }
 
 #arg 1: exec file path
@@ -499,10 +473,6 @@ DeployApp()
 {
 	ExtractApp "$WINEPREFIX"
 
-    if UsePublicDir;then
-        chgrp -R users "$WINEPREFIX"
-        chmod -R 0775 "$WINEPREFIX"
-    fi
 
 	echo "$APPVER" > "$WINEPREFIX/PACKAGE_VERSION"
 
@@ -541,10 +511,6 @@ UpdateApp()
 	ExtractApp "${WINEPREFIX}.tmpdir"
 	$SHELL_DIR/updater -s "${WINEPREFIX}.tmpdir" -c "${WINEPREFIX}" -v
 
-    if UsePublicDir;then
-        chgrp -R users "$WINEPREFIX"
-        chmod -R 0775 "$WINEPREFIX"
-    fi
 
 	rm -rf "${WINEPREFIX}.tmpdir"
 	echo "$APPVER" > "$WINEPREFIX/PACKAGE_VERSION"
@@ -562,8 +528,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 "$@"
 }
@@ -615,9 +579,6 @@ fi
 BOTTLENAME="$1"
 WINEPREFIX="$HOME/.deepinwine/$1"
 
-if UsePublicDir;then
-    WINEPREFIX="$PUBLIC_DIR/$1"
-fi
 
 APPDIR="/opt/apps/${DEB_PACKAGE_NAME}/files"
 if [ -f "$APPDIR/files.md5sum" ];then

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

@@ -0,0 +1,69 @@
+#/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使用"
+echo "参数为CONTAINER_PATH"
+echo "只读取第一个，其他参数会被放弃"
+fi
+
+CONTAINER_PATH="$1"
+
+mkdir -p $HOME/.config/spark-wine/
+#####全局参数位置
+#####能到这一步的说明已经是没有自定义参数了，直接读全局覆盖没问题
+#####
+
+if [ -f "$HOME/.config/spark-wine/scale.txt" ];then
+	cat $HOME/.config/spark-wine/scale.txt > $CONTAINER_PATH/scale.txt
+	echo "检测到已经设置过全局参数，直接复制"
+    echo "全局参数的位置在$HOME/.config/spark-wine/scale.txt，如果需要更换请删除此文件重新生成"
+	exit
+fi
+
+
+Get_Dist_Name
+if [ "$DISTRO" = "Deepin" ] || [ "$DISTRO" = "UniontechOS" ];then
+echo 1.0 > $HOME/.config/spark-wine/scale.txt
+cat $HOME/.config/spark-wine/scale.txt > $CONTAINER_PATH/scale.txt
+#####就是1倍缩放
+exit
+fi
+
+
+
+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="缩放倍率" \
+       1.0 \
+       1.25 \
+	1.5 \
+	1.75 \
+       2.0`
+
+case "$scale_factor" in 
+	"")
+	zenity --info --text="默认为1倍缩放。您可以随时删除~/.config/spark-wine/scale.txt来重新设置" --width=500 --height=150
+	scale_factor="1.0"
+	;;
+	*)
+zenity --info --text="缩放倍数为$scale_factor。已保存！您可以随时删除~/.config/spark-wine/scale.txt来重新设置" --width=500 --height=150
+	;;
+esac
+echo "$scale_factor" > $HOME/.config/spark-wine/scale.txt
+cat $HOME/.config/spark-wine/scale.txt > $CONTAINER_PATH/scale.txt
+

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

@@ -4,14 +4,14 @@ help() {
     cat <<EOF
 用法：$0 [-h|--help] [-s|--set-scale-factor] path
 -h|--help               显示这个帮助
--s|--set-scale-factor   直接指定缩放。支持1.0，1.25，1.5，2.0	
+-s|--set-scale-factor   直接指定缩放。支持1.0，1.25，1.5，1.75，2.0	
 path                    容器目录
 
 
 --------------------------------------------------------------------
 Usage: $0 [-h|--help] [-s|--set-scale-factor] path
 -h|--help               Show this text
--s|--set-scale-factor   Set scale factor direcly. Support 1.0，1.25，1.5，2.0	
+-s|--set-scale-factor   Set scale factor direcly. Support 1.0，1.25，1.5，1.75，2.0	
 path                    Wine Container directory path
 
 
@@ -27,7 +27,8 @@ parse_args() {
             exit
             ;;
 	-s|--set-scale-factor)
-	scale_factor="$2"
+	appointed_scale_factor="$2"
+    
 	;;
         *)
             CONTAINER_PATH="$1"
@@ -48,41 +49,54 @@ if [ ! -f "$CONTAINER_PATH/user.reg" ];then
 fi
 
 
-if [ "$scale_factor" = "" ];then
-#########未指定下
-until [ "$env_dwine_scale" != "" ];do
+if [ "$appointed_scale_factor" = "" ];then
+#########未指定下，读取$CONTAINER_PATH/scale.txt。如果没有，优先$DEEPIN_WINE_SCALE设置，然后是手动
 
-env_dwine_scale=`echo $DEEPIN_WINE_SCALE`
-if [ "$env_dwine_scale" = "" ];then
-echo "E: No DEEPIN_WINE_SCALE found. Use spark-get-scale to Set "
-echo "错误：没有检测到DEEPIN_WINE_SCALE，用spark-get-scale设置"
-/opt/durapps/spark-dwine-helper/spark-get-scale.sh 
-env_dwine_scale=`cat ~/.config/spark-wine/scale.txt`
-echo "检测到的缩放倍数为:$env_dwine_scale"
-echo "Scale is $env_dwine_scale"
-
-else
-echo "检测到的缩放倍数为:$env_dwine_scale"
-echo "Scale is $env_dwine_scale"
+if [ ! -f "$CONTAINER_PATH/scale.txt" ];then
+	
+	echo "E: No SCALE profile found. try to use DEEPIN_WINE_SCALE"
+	echo "错误：没有检测到缩放设置，读取DEEPIN_WINE_SCALE"
+	if [ "$DEEPIN_WINE_SCALE" = "" ];then
+		echo "E: No DEEPIN_WINE_SCALE found. Use get-scale.sh to Set "
+		echo "错误：没有检测到DEEPIN_WINE_SCALE，用get-scale.sh设置"
+		/opt/durapps/spark-dwine-helper/scale-set-helper/get-scale.sh "$CONTAINER_PATH"
+		wine_scale=`cat $CONTAINER_PATH/scale.txt`
+		echo "检测到的缩放倍数为:$wine_scale"
+		echo "Scale is $wine_scale"
+	else
+		echo "$DEEPIN_WINE_SCALE" > $CONTAINER_PATH/scale.txt
+		wine_scale=`cat $CONTAINER_PATH/scale.txt`
+		echo "检测到的缩放倍数为:$wine_scale"
+		echo "Scale is $wine_scale"
 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"
 
-done
+
+fi
 #####非deepin发行版似乎没有这个变量，暂时不清楚这个变量是哪个组件做的
 
+
+
 else
 #######指定了缩放倍数
 echo "使用了--set-scale-factor，直接指定"
 echo "--set-scale-factor detected. Arrange directly"
 
 
-if [ "$scale_factor" != "1.0" ] && [ "$scale_factor" != "1.25" ] && [ "$scale_factor" != "1.5" ]  && [ "$scale_factor" != "2.0" ] ;then
-echo "无法识别的倍数：$scale_factor，请参看$0 -h"
+if [ "$appointed_scale_factor" != "1.0" ] && [ "$appointed_scale_factor" != "1.25" ] && [ "$appointed_scale_factor" != "1.5" ]  && [ "$appointed_scale_factor" != "1.75" ] && [ "$appointed_scale_factor" != "2.0" ] ;then
+echo "无法识别的倍数：$appointed_scale_factor，请参看$0 -h"
 echo "Unrecognizable number. Use $0 -h to get help"
 exit 1
 fi
 #######没问题了再用
-env_dwine_scale=`echo $scale_factor`
-
+echo "$appointed_scale_factor" > $CONTAINER_PATH/scale.txt
+wine_scale=`cat $CONTAINER_PATH/scale.txt`
 
 fi
 
@@ -91,7 +105,7 @@ fi
 
 if [ "$APPRUN_CMD" = "" ];then
 echo "没有检测到APPRUN_CMD环境变量，执行sed替换。如果要使用wine原生提供的方法，请在环境变量中指定(export)"
-case "$env_dwine_scale" in
+case "$wine_scale" in
        1.0)
             reg_text="\"LogPixels\"=dword:00000060"
             ;;
@@ -101,6 +115,9 @@ case "$env_dwine_scale" in
         1.5)
             reg_text="\"LogPixels\"=dword:00000090"
             ;;
+        1.75)
+            reg_text="\"LogPixels\"=dword:000000A8"
+            ;;
         2.0)
             reg_text="\"LogPixels\"=dword:000000C0"
             ;;
@@ -132,7 +149,7 @@ echo "---------------------------------------"
 else
 #####用wine提供的方法
 
-case "$env_dwine_scale" in
+case "$wine_scale" in
        1.0)
             dpi="96"
             ;;
@@ -142,6 +159,9 @@ case "$env_dwine_scale" in
         1.5)
             dpi="144"
             ;;
+        1.75)
+            dpi="168"
+            ;;
         2.0)
             dpi="192"
             ;;
@@ -156,4 +176,4 @@ echo "env WINEPREFIX="$CONTAINER_PATH" $APPRUN_CMD reg ADD 'HKCU\Control Panel\D
 
 env WINEPREFIX="$CONTAINER_PATH" $APPRUN_CMD reg ADD 'HKCU\Control Panel\Desktop' /v LogPixels /t REG_DWORD /d $dpi /f
 
-fi
+fi

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

@@ -1,52 +0,0 @@
-#/bin/bash
-
-mkdir -p ~/.config/spark-wine/
-
-
-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
-}
-
-Get_Dist_Name
-if [ "$DISTRO" = "Deepin" ] || [ "$DISTRO" = "UniontechOS" ];then
-echo 1.0 > ~/.config/spark-wine/scale.txt
-#####就是1倍缩放
-exit
-fi
-
-real_path_of_the_fucking_scale_txt=`echo ~/.config/spark-wine/scale.txt`
-if [ -f "$real_path_of_the_fucking_scale_txt" ];then
-echo "设置过了，直接读"
-unset real_path_of_the_fucking_scale_txt
-exit
-fi
-
-dimensions=`xdpyinfo | grep dimensions | sed -r 's/^[^0-9]*([0-9]+x[0-9]+).*$/\1/'`
-scale_factor=`zenity --list \
-	--width=700 \
-	--height=300 \
-       --title="您的分辨率是：$dimensions，请在以下选项中选择一个以运行应用" \
-       --column="缩放倍率" \
-       1.0 \
-       1.25 \
-	1.5 \
-       2.0`
-
-case "$scale_factor" in 
-	"")
-	zenity --info --text="默认为1倍缩放。您可以随时删除~/.config/spark-wine/scale.txt来重新设置"
-	scale_factor="1.0"
-	;;
-	*)
-zenity --info --text="缩放倍数为$scale_factor。已保存！您可以随时删除~/.config/spark-wine/scale.txt来重新设置" --width=500 --height=150
-	;;
-esac
-echo "$scale_factor" > ~/.config/spark-wine/scale.txt
-

spark-dwine-helper/spark_run_custom.sh

@@ -8,8 +8,7 @@
 #
 #   Modifier:   shenmo <shenmo@spark-app.store>
 #		   
-#   diff: Now will run set-dwine-scale.sh in stage RunApp before CallApp
-#         Deleted Deepin-* to simplify the script
+
 #
 #
 #
@@ -48,32 +47,7 @@ if [ $SPECIFY_SHELL_DIR ]; then
     SHELL_DIR=$SPECIFY_SHELL_DIR
 fi
 
-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
-}
-########关于公共文件夹，暂时意义不明
 
 _DeleteRegistry()
 {
@@ -238,10 +212,7 @@ DeployApp()
 {
 	ExtractApp "$WINEPREFIX"
 
-    if UsePublicDir;then
-        chgrp -R users "$WINEPREFIX"
-        chmod -R 0775 "$WINEPREFIX"
-    fi
+
 
 	echo "$APPVER" > "$WINEPREFIX/PACKAGE_VERSION"
 
@@ -280,10 +251,7 @@ UpdateApp()
 	ExtractApp "${WINEPREFIX}.tmpdir"
 	$SHELL_DIR/updater -s "${WINEPREFIX}.tmpdir" -c "${WINEPREFIX}" -v
 
-    if UsePublicDir;then
-        chgrp -R users "$WINEPREFIX"
-        chmod -R 0775 "$WINEPREFIX"
-    fi
+ 
 
 	rm -rf "${WINEPREFIX}.tmpdir"
 	echo "$APPVER" > "$WINEPREFIX/PACKAGE_VERSION"
@@ -301,8 +269,8 @@ 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"
+#############  WARNING: Here is the modified content: Now will run set-wine-scale.sh
+	/opt/durapps/spark-dwine-helper/scale-set-helper/set-wine-scale.sh "$WINEPREFIX" "$WINEPREFIX"
 
     CallApp "$@"
 }
@@ -354,9 +322,7 @@ fi
 BOTTLENAME="$1"
 WINEPREFIX="$HOME/.deepinwine/$1"
 
-if UsePublicDir;then
-    WINEPREFIX="$PUBLIC_DIR/$1"
-fi
+
 
 APPDIR="/opt/apps/${DEB_PACKAGE_NAME}/files"
 if [ -f "$APPDIR/files.md5sum" ];then

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
-}
-
-####获得发行版名称