spark-store-project/spark-wine
15
0
Fork 0
mirror of https://gitee.com/spark-store-project/spark-wine synced 2026-05-14 02:00:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

修改： spark-dwine-helper/pkg/DEBIAN/control

Browse Source 
修改：     spark-dwine-helper/pkg/opt/deepinwine/tools/spark_run_v4.sh
	修改：     spark-dwine-helper/pkg/opt/durapps/spark-dwine-helper/set-dwine-scale.sh
This commit is contained in:
shenmo
2022-05-31 22:27:40 +08:00
parent c6c116c88d
commit 01761b00ab
3 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spark-dwine-helper/pkg/DEBIAN/control
View File

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

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

@@ -8,7 +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 # diff: Now will run set-dwine-scale.sh in stage CallProcess before CallApp
# Deleted Deepin-* to simplify the script # Deleted Deepin-* to simplify the script
# #
WINEPREFIX="$HOME/.deepinwine/@public_bottle_name@" WINEPREFIX="$HOME/.deepinwine/@public_bottle_name@"
@@ -171,7 +171,8 @@ CallProcess()
fi fi
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
/opt/durapps/spark-dwine-helper/set-dwine-scale.sh "$WINEPREFIX"
env WINEPREFIX="$WINEPREFIX" $WINE_CMD "$@" & env WINEPREFIX="$WINEPREFIX" $WINE_CMD "$@" &
#start autobottle #start autobottle
@@ -377,14 +378,14 @@ CallTHS()
xdg-mime default "$DEB_PACKAGE_NAME".desktop "$MIME_TYPE" xdg-mime default "$DEB_PACKAGE_NAME".desktop "$MIME_TYPE"
fi fi
env WINEPREFIX="$WINEPREFIX" $WINE_CMD "$@" & CallProcess "$@"
} }
CallQQGameV2() CallQQGameV2()
{ {
debug_log "run $1" debug_log "run $1"
$SHELL_DIR/kill.sh QQMicroGameBox block $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() CallPsCs6()
@@ -410,7 +411,7 @@ CallPsCs6()
debug_log_to_file "Starting process $* ..." debug_log_to_file "Starting process $* ..."
env WINEPREFIX="$WINEPREFIX" $WINE_CMD "$@" & CallProcess "$@"
} }
#arg 1: exec file path #arg 1: exec file path
@@ -562,8 +563,6 @@ 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
/opt/durapps/spark-dwine-helper/set-dwine-scale.sh "$WINEPREFIX"
CallApp "$@" CallApp "$@"
} }

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

@@ -71,11 +71,14 @@ if [ !-f "$CONTAINER_PATH/scale.txt" ];then
fi fi
else else
wine_scale=`cat $CONTAINER_PATH/scale.txt` 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 "检测到的缩放倍数为:$wine_scale"
echo "Scale is $wine_scale" echo "Scale is $wine_scale"
fi fi
#####非deepin发行版似乎没有这个变量，暂时不清楚这个变量是哪个组件做的 #####非deepin发行版似乎没有这个变量，暂时不清楚这个变量是哪个组件做的