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

新文件：   spark-dwine-helper/pkg/opt/durapps/spark-dwine-helper/scale-set-helper/bunny.txt
	修改：     spark-dwine-helper/pkg/opt/durapps/spark-dwine-helper/scale-set-helper/get-scale.sh
	修改：     spark-dwine-helper/pkg/opt/durapps/spark-dwine-helper/scale-set-helper/set-wine-scale.sh

spark-dwine-helper/pkg/DEBIAN/control

@@ -1,5 +1,5 @@
 Package: spark-dwine-helper
-Version: 1.5.1
+Version: 1.6.3
 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 CallProcess 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()
 {
@@ -172,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
@@ -239,6 +212,23 @@ CallQQ()
     CallProcess "$@"
 }
 
+CallTiktokCN()
+{
+    if [ ! -f "$WINEPREFIX/../.TiktokCN_run" ]; then
+        debug_log "first run time"
+        $SHELL_DIR/add_hotkeys
+        $SHELL_DIR/fontconfig
+        touch "$WINEPREFIX/../.TiktokCN_run"
+    fi
+
+    chmod 555 /home/${USER}/.deepinwine/Spark-tiktokCN/drive_c/users/${USER}/Application\ Data/douyin
+    chmod 555 /home/${USER}/.deepinwine/Spark-tiktokCN/drive_c/users/@surrent_user@/Application\ Data/douyin
+    chmod 555 /home/${USER}/.deepinwine/Spark-tiktokCN.tmpdir/drive_c/users/${USER}/Application\ Data/douyin
+    chmod 555 /home/${USER}/.deepinwine/Spark-tiktokCN.tmpdir/drive_c/users/@surrent_user@/Application\ Data/douyin
+
+    CallProcess "$@"
+}
+
 CallTIM()
 {
     if [ ! -f "$WINEPREFIX/../.QQ_run" ]; then
@@ -426,6 +416,9 @@ CallApp()
         "Deepin-WangWang")
             CallWangWang "$@"
             ;;
+        "Spark-tiktokCN")
+            CallTiktokCN "$@"
+            ;;
         "Deepin-ZhuMu")
             CallZhuMu "$@"
             ;;
@@ -500,10 +493,6 @@ DeployApp()
 {
 	ExtractApp "$WINEPREFIX"
 
-    if UsePublicDir;then
-        chgrp -R users "$WINEPREFIX"
-        chmod -R 0775 "$WINEPREFIX"
-    fi
 
 	echo "$APPVER" > "$WINEPREFIX/PACKAGE_VERSION"
 
@@ -532,7 +521,7 @@ UpdateApp()
 	fi
 
     case $BOTTLENAME in
-        "Deepin-Intelligent" | "Deepin-QQ" | "Deepin-TIM" | "Deepin-WeChat" | "Deepin-WXWork" | "Deepin-Dding")
+        "Deepin-Intelligent" | "Deepin-QQ" | "Deepin-TIM" | "Deepin-WeChat" | "Deepin-WXWork" | "Deepin-Dding" | "Wine-QQ" | "Spark-QQ" | "Spark-weixin")
             rm -rf "$WINEPREFIX"
             DeployApp
             return
@@ -542,10 +531,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"
@@ -614,9 +599,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/bunny.txt

@@ -0,0 +1,92 @@
+ ___                                                  
+(   )                                                 
+ | | .-.    ___  ___    .--.     .--.                 
+ | |/   \  (   )(   )  /    \   /    \                
+ |  .-. .   | |  | |  ;  ,-. ' |  .-. ;               
+ | |  | |   | |  | |  | |  | | |  | | |               
+ | |  | |   | |  | |  | |  | | |  |/  |               
+ | |  | |   | |  | |  | |  | | |  ' _.'               
+ | |  | |   | |  ; '  | '  | | |  .'.-.               
+ | |  | |   ' `-'  /  '  `-' | '  `-' /               
+(___)(___)   '.__.'    `.__. |  `.__.'                
+                       ( `-' ;                        
+                        `.__.                         
+ ___                                                  
+(   )                                                 
+ | |.-.     .---.   ___ .-.      .--.    ___ .-.      
+ | /   \   / .-, \ (   )   \    /    \  (   )   \     
+ |  .-. | (__) ; |  | ' .-. ;  |  .-. ;  |  .-. .     
+ | |  | |   .'`  |  |  / (___) | |  | |  | |  | |     
+ | |  | |  / .'| |  | |        | |  | |  | |  | |     
+ | |  | | | /  | |  | |        | |  | |  | |  | |     
+ | '  | | ; |  ; |  | |        | '  | |  | |  | |     
+ ' `-' ;  ' `-'  |  | |        '  `-' /  | |  | |     
+  `.__.   `.__.'_. (___)        `.__.'  (___)(___)    
+                                                      
+                                                      
+ ___                                                  
+(   )                                                 
+ | |.-.    ___  ___   ___ .-.    ___ .-.    ___  ___  
+ | /   \  (   )(   ) (   )   \  (   )   \  (   )(   ) 
+ |  .-. |  | |  | |   |  .-. .   |  .-. .   | |  | |  
+ | |  | |  | |  | |   | |  | |   | |  | |   | |  | |  
+ | |  | |  | |  | |   | |  | |   | |  | |   | '  | |  
+ | |  | |  | |  | |   | |  | |   | |  | |   '  `-' |  
+ | '  | |  | |  ; '   | |  | |   | |  | |    `.__. |  
+ ' `-' ;   ' `-'  /   | |  | |   | |  | |    ___ | |  
+  `.__.     '.__.'   (___)(___) (___)(___)  (   )' |  
+                                             ; `-' '  
+                                              .__.'   
+    ............                .....]OOOo]`....           
+    ... ........                ...=OOOOOOOOO\..           
+    .../OOOOOOO`....            ..=OOO@/[\OOOOO.           
+    ..=OOOOOOOOO\...            .,@OO^/....O@O@`           
+    ..OOOOOO[[OOO@`.            .=OO@,...=.OOOO.           
+    ..OOOOO./O^,@OO`            .=OO^....,.@OO^.           
+    ..\OOO@^...=OOOO....        .OOO^*..,`/OOO..           
+    ...\OOOOOOOooooO^...        .=OO^...`=OO@`..           
+      ..=@O@OooOOOOO@`...........=@@O]].,@O@`...           
+        .,@OoOO`...O@^......,]]]]/OOOOOOO@@... .           
+        ...\OO@]]]OOOO@@@@@@@@@@@@@@@@@@@OO.....           
+        .....[@@OOO@@@@@@@@@@@@@@@@@@@@@@@@@@`..           
+            ..OOO@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@`....       
+            .,@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@\...       
+        ....=@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@^..       
+        ...=@@@@@@@@@@@@@@@@@@@@@@`,\@@@@@@@@@@@@@^.       
+        ..,@@@@@@@@@@@@@@@@@@@@@@@O,[].\@@@@@@@@@@@.       
+        ../@@@@@@@@@@@@O@@@@@@@@@@@......\@@@@@@@@@^          
+        .,@@@@@@@@@@@O`.\@@@@@@@@@/........\@@@@@@@@...    
+        .=@@@@@@@@@/.....\@@@@@@@@/`...[O`..\@@@@@@@`...   
+        .=@@@@@@@^,O[..,`.,@@@@@/../@@O[`...,@@@@@@@....   
+      ....@@@@@@@O`,@@O[]..,@/[`..=oo@O`,^...@@@@@@@@`..   
+    ....O@@@@@@@@`,OOO@^*\.........\..../.../@`.=^..       
+    .. ...,@^=@@@^.\`...,^...........[[......O]//...       
+          ..,\]@@@\...[`....................=@@/....       
+            .=@@\............,]/`........../@@@\.. .       
+        .....@@@@@\.....................,/@@@@@@\...       
+         ...=@@@@@@@@\]..............]@@@@@@@@@@@@`.       
+        ...,@@@@@@@@@@@@@@/[\O@@O/[*./@@@@@@@@@@@@@\.......
+        ...@@@@@@@@@@@@@@@^.,O@@@@^../@@@@@@@@@@@@@@@\.....
+..........@@@@@@@@@@@@@@@@@`..`\/`../@@@@@@@@@@@@@@@@@@@@]]
+........,@@@@@@@@@@@@@@@@/*[\].,`]/[[@@@@@@@@@@@@@@,[[[[`..
+..,O\/@@@@@@@@@@@@@@@@@@@`...........O@@O@@@@@@@@@@\....   
+.....\@@@@@@@@@@@@@@@@@@@OO\`,O..   .,@OOO@@@@@@@@@@. ..   
+    ..../@@@@@@@@@@@@@@OO@`.^,O.    ..=@OOO@@@@@@@@@.. .   
+    ...=@@@@@@@@@@@@@@@@@O[[....    ...\@@@@@@@@@@@/.. .   
+    ...=@@@@@@@@@@@@@@,^            ....O...\@@@@@@`       
+    ....@@@@@@@@@@@@@/..            ...^/\]/[\@@@@`.       
+        .@@@@/@@@@@@@^O.....        ...,@@^]..]@/...       
+        ...\@`.[@@@@@@......        .=`@@@@@^..^....       
+        ....`....[@@@O\.[,..........OO@@@@@^.,[[....       
+        ............\@@@\`...,`**,]@@@@@@@^.........       
+..                  .,@@@@@@@@@@@@@@@@@@/...               
+                    ..O@@@@@@@@@@@@@@@@@^...               
+                    ..O@@@@@@^...=@@@@@@@...               
+                    ..@@@@@@@\...=@@@@@@@^..               
+                    .=@@@@@@@@...=@@@@@@@O..               
+                    .=@@@@@@@@`..=@@@@@@@@..               
+                    .=@@@O@@@@^..=@@OO@@@@^.               
+                    .O@OOOOO@O^..=@OOOOOOO^.               
+                    .Oo/[\O/\O@..=/[\O/\o*O.               
+                    .O^......=O...^......*/.               
+                    .=\.....]O^...\\...]//..    .. ........

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

@@ -4,7 +4,7 @@ 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
+    elif grep -Eqi "UnionTech" /etc/issue || grep -Eq "UnionTech" /etc/*-release; then
         DISTRO='UniontechOS'
     else
 	 DISTRO='OtherOS'
@@ -13,21 +13,30 @@ Get_Dist_Name()
 #########<<<<<<<
 
 if [ $# -lt 1 ]; then
-echo "无参数，无法启动。请参考set-dwine-scale.sh使用"
+echo "无参数，无法启动。这是一个set-wine-scale的组件，一般来说，你不会需要单独启动这个脚本"
+echo "请参考set-wine-scale.sh使用"
 echo "参数为CONTAINER_PATH"
 echo "只读取第一个，其他参数会被放弃"
 fi
 
 CONTAINER_PATH="$1"
 
+if [ ! -f "$CONTAINER_PATH/user.reg" ];then
+	echo "错误：找不到user.reg，退出。你应当在文件解压结束后调用此脚本"
+    echo "E: Can not find user.reg. Exit. You should use this script after the extraction"
+	exit 1
+fi
+
+
 mkdir -p $HOME/.config/spark-wine/
 #####全局参数位置
 #####能到这一步的说明已经是没有自定义参数了，直接读全局覆盖没问题
 #####
 
-if [ !-f "$HOME/.config/spark-wine/scale.txt" ];then
+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
 

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

@@ -7,14 +7,14 @@ help() {
 -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，1.75，2.0	
 path                    Wine Container directory path
 
-
+                                         This script have super bunny power.
 EOF
 }
 #########################帮助文件结束#############################
@@ -30,6 +30,13 @@ parse_args() {
 	appointed_scale_factor="$2"
     
 	;;
+
+	"bunny")
+		cat /opt/durapps/spark-dwine-helper/scale-set-helper/bunny.txt
+	exit
+
+	;;
+
         *)
             CONTAINER_PATH="$1"
 
@@ -43,8 +50,10 @@ parse_args "$@"
 
 #####先看看PATH对不对
 if [ ! -f "$CONTAINER_PATH/user.reg" ];then
-	echo "错误：找不到user.reg，退出。你应当在文件解压结束后调用此脚本"
+	echo "错误：找不到user.reg，退出。你应当在文件解压结束后调用此脚本。"
+	echo "如果你不清楚如何使用这个脚本，请使用 $0 -h"
     echo "E: Can not find user.reg. Exit. You should use this script after the extraction"
+	echo "If you don't know how to use this script, try $0 -h"
 	exit 1
 fi
 
@@ -57,9 +66,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 +185,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/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

@@ -20,7 +20,7 @@ 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
+    elif grep -Eqi "UnionTech" /etc/issue || grep -Eq "UnionTech" /etc/*-release; then
         DISTRO='UniontechOS'
     else
 	 DISTRO='OtherOS'