From 93f096bca58290f91ba104fd6afff00f963c9cc9 Mon Sep 17 00:00:00 2001
From: shenmo7192 <jifengshenmo@outlook.com>
Date: Fri, 10 Jun 2022 19:51:09 +0800
Subject: [PATCH] =?UTF-8?q?=09=E4=BF=AE=E6=94=B9=EF=BC=9A=20=20=20=20=20sp?=
 =?UTF-8?q?ark-dwine-helper/pkg/opt/deepinwine/tools/spark=5Frun=5Fv4.sh?=
 =?UTF-8?q?=20=09=E9=87=8D=E5=91=BD=E5=90=8D=EF=BC=9A=20=20=20spark-dwine-?=
 =?UTF-8?q?helper/pkg/opt/durapps/spark-dwine-helper/spark-get-scale.sh=20?=
 =?UTF-8?q?->=20spark-dwine-helper/pkg/opt/durapps/spark-dwine-helper/scal?=
 =?UTF-8?q?e-set-helper/get-scale.sh=20=09=E9=87=8D=E5=91=BD=E5=90=8D?=
 =?UTF-8?q?=EF=BC=9A=20=20=20spark-dwine-helper/pkg/opt/durapps/spark-dwin?=
 =?UTF-8?q?e-helper/set-dwine-scale.sh=20->=20spark-dwine-helper/pkg/opt/d?=
 =?UTF-8?q?urapps/spark-dwine-helper/scale-set-helper/set-wine-scale.sh=20?=
 =?UTF-8?q?=09=E4=BF=AE=E6=94=B9=EF=BC=9A=20=20=20=20=20spark-dwine-helper?=
 =?UTF-8?q?/spark=5Frun=5Fcustom.sh?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pkg/opt/deepinwine/tools/spark_run_v4.sh              | 4 ++--
 .../{spark-get-scale.sh => scale-set-helper/get-scale.sh} | 0
 .../set-wine-scale.sh}                                    | 8 ++++----
 spark-dwine-helper/spark_run_custom.sh                    | 7 +++----
 4 files changed, 9 insertions(+), 10 deletions(-)
 rename spark-dwine-helper/pkg/opt/durapps/spark-dwine-helper/{spark-get-scale.sh => scale-set-helper/get-scale.sh} (100%)
 rename spark-dwine-helper/pkg/opt/durapps/spark-dwine-helper/{set-dwine-scale.sh => scale-set-helper/set-wine-scale.sh} (95%)

diff --git a/spark-dwine-helper/pkg/opt/deepinwine/tools/spark_run_v4.sh b/spark-dwine-helper/pkg/opt/deepinwine/tools/spark_run_v4.sh
index 47f5598..a119444 100755
--- a/spark-dwine-helper/pkg/opt/deepinwine/tools/spark_run_v4.sh
+++ b/spark-dwine-helper/pkg/opt/deepinwine/tools/spark_run_v4.sh
@@ -145,7 +145,7 @@ CallProcess()
 
     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"
+	/opt/durapps/spark-dwine-helper/scale-set-helper/set-wine-scale.sh "$WINEPREFIX"
     env WINEPREFIX="$WINEPREFIX" $WINE_CMD "$@" &
 
     #start autobottle
@@ -624,4 +624,4 @@ case $4 in
 		exit 1
 		;;
 esac
-exit 0
\ No newline at end of file
+exit 0
diff --git a/spark-dwine-helper/pkg/opt/durapps/spark-dwine-helper/spark-get-scale.sh b/spark-dwine-helper/pkg/opt/durapps/spark-dwine-helper/scale-set-helper/get-scale.sh
similarity index 100%
rename from spark-dwine-helper/pkg/opt/durapps/spark-dwine-helper/spark-get-scale.sh
rename to spark-dwine-helper/pkg/opt/durapps/spark-dwine-helper/scale-set-helper/get-scale.sh
diff --git a/spark-dwine-helper/pkg/opt/durapps/spark-dwine-helper/set-dwine-scale.sh b/spark-dwine-helper/pkg/opt/durapps/spark-dwine-helper/scale-set-helper/set-wine-scale.sh
similarity index 95%
rename from spark-dwine-helper/pkg/opt/durapps/spark-dwine-helper/set-dwine-scale.sh
rename to spark-dwine-helper/pkg/opt/durapps/spark-dwine-helper/scale-set-helper/set-wine-scale.sh
index efb9772..a2d7cae 100755
--- a/spark-dwine-helper/pkg/opt/durapps/spark-dwine-helper/set-dwine-scale.sh
+++ b/spark-dwine-helper/pkg/opt/durapps/spark-dwine-helper/scale-set-helper/set-wine-scale.sh
@@ -57,9 +57,9 @@ 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 spark-get-scale to Set "
-		echo "错误：没有检测到DEEPIN_WINE_SCALE，用spark-get-scale设置"
-		/opt/durapps/spark-dwine-helper/spark-get-scale.sh "$CONTAINER_PATH"
+		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"
@@ -176,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
\ No newline at end of file
+fi
diff --git a/spark-dwine-helper/spark_run_custom.sh b/spark-dwine-helper/spark_run_custom.sh
index 7f341dd..3dac60b 100755
--- a/spark-dwine-helper/spark_run_custom.sh
+++ b/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
+
 #
 #
 #
@@ -270,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 "$@"
 }