spark-store-project/spark-wine
15
0
Fork 0
mirror of https://gitee.com/spark-store-project/spark-wine synced 2025-12-18 21:11:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
重命名：   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
This commit is contained in:
shenmo
2022-06-10 19:51:09 +08:00
parent 43e11b2e7f
commit 93f096bca5
4 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -145,7 +145,7 @@ CallProcess()
debug_log_to_file "Starting process $* ..." debug_log_to_file "Starting process $* ..."
############# WARNING: Here is the modified content: Now will run set-dwine-scale.sh ############# 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 "$@" & env WINEPREFIX="$WINEPREFIX" $WINE_CMD "$@" &
#start autobottle #start autobottle
@@ -624,4 +624,4 @@ case $4 in
exit 1 exit 1
;; ;;
esac esac
exit 0 exit 0

0
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
View File

8
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
View File

@@ -57,9 +57,9 @@ if [ ! -f "$CONTAINER_PATH/scale.txt" ];then
echo "E: No SCALE profile found. try to use DEEPIN_WINE_SCALE" echo "E: No SCALE profile found. try to use DEEPIN_WINE_SCALE"
echo "错误：没有检测到缩放设置，读取DEEPIN_WINE_SCALE" echo "错误：没有检测到缩放设置，读取DEEPIN_WINE_SCALE"
if [ "$DEEPIN_WINE_SCALE" = "" ];then if [ "$DEEPIN_WINE_SCALE" = "" ];then
echo "E: No DEEPIN_WINE_SCALE found. Use spark-get-scale to Set " echo "E: No DEEPIN_WINE_SCALE found. Use get-scale.sh to Set "
echo "错误：没有检测到DEEPIN_WINE_SCALE，用spark-get-scale设置" echo "错误：没有检测到DEEPIN_WINE_SCALE，用get-scale.sh设置"
/opt/durapps/spark-dwine-helper/spark-get-scale.sh "$CONTAINER_PATH" /opt/durapps/spark-dwine-helper/scale-set-helper/get-scale.sh "$CONTAINER_PATH"
wine_scale=`cat $CONTAINER_PATH/scale.txt` wine_scale=`cat $CONTAINER_PATH/scale.txt`
echo "检测到的缩放倍数为:$wine_scale" echo "检测到的缩放倍数为:$wine_scale"
echo "Scale is $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 env WINEPREFIX="$CONTAINER_PATH" $APPRUN_CMD reg ADD 'HKCU\Control Panel\Desktop' /v LogPixels /t REG_DWORD /d $dpi /f
fi fi

7
spark-dwine-helper/spark_run_custom.sh
View File

@@ -8,8 +8,7 @@
# #
# Modifier: shenmo <shenmo@spark-app.store> # 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 else
DeployApp | progressbar $BOTTLENAME "初始化$BOTTLENAME中..." DeployApp | progressbar $BOTTLENAME "初始化$BOTTLENAME中..."
fi fi
############# WARNING: Here is the modified content: Now will run set-dwine-scale.sh ############# WARNING: Here is the modified content: Now will run set-wine-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" "$WINEPREFIX"
CallApp "$@" CallApp "$@"
} }