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

修改:     spark-dwine-helper/pkg/opt/durapps/spark-dwine-helper/set-dwine5-scale.sh
	修改:     spark-dwine-helper/pkg/opt/durapps/spark-dwine-helper/spark-get-scale.sh
This commit is contained in:
2022-05-30 15:05:07 +08:00
parent 517305db87
commit d82405717a
3 changed files with 16 additions and 17 deletions

View File

@@ -1,6 +1,6 @@
Package: spark-dwine-helper Package: spark-dwine-helper
Version: 1.1 Version: 1.1
Architecture: i386 Architecture: all
Maintainer: shenmo <shenmo@spark-app.store> Maintainer: shenmo <shenmo@spark-app.store>
Installed-Size: 2293 Installed-Size: 2293
Depends: zenity:amd64, p7zip-full:amd64, fonts-noto-cjk,deepin-wine-helper(>=5.1) Depends: zenity:amd64, p7zip-full:amd64, fonts-noto-cjk,deepin-wine-helper(>=5.1)

View File

@@ -50,12 +50,16 @@ fi
until [ "$env_dwine_scale" != "" ];do until [ "$env_dwine_scale" != "" ];do
env_dwine_scale=`echo $DEEPIN_WINE_SCALE` env_dwine_scale=`echo $DEEPIN_WINE_SCALE`
if [ "$env_dwine_scale" = "" ];then if [ "$env_dwine_scale" = "" ];then
echo "E: No DEEPIN_WINE_SCALE found. Use spark-dwine-scale-env-generator to generate" echo "E: No DEEPIN_WINE_SCALE found. Use spark-get-scale to Set "
echo "错误没有检测到DEEPIN_WINE_SCALE用spark-dwine-scale-env-generator生成" echo "错误没有检测到DEEPIN_WINE_SCALE用spark-get-scale设置"
/opt/durapps/spark-dwine-helper/spark-get-scale.sh $CONTAINER_PATH /opt/durapps/spark-dwine-helper/spark-get-scale.sh
env_dwine_scale=echo "$?" env_dwine_scale=`echo ~/.config/spark-wine/scale.txt`
echo "检测到的缩放倍数为:$env_dwine_scale"
echo "Scale is $env_dwine_scale"
else else
echo "检测到的缩放倍数为:$env_dwine_scale" echo "检测到的缩放倍数为:$env_dwine_scale"
echo "Scale is $env_dwine_scale" echo "Scale is $env_dwine_scale"

View File

@@ -1,11 +1,6 @@
#/bin/bash #/bin/bash
##### $1是容器位置
if [ "$1" = "" ];then
echo "错误没有输入容器地址。请参考set-dwine5-scale对本脚本的调用"
exit
fi
mkdir -p ~/.config/spark-wine/
Get_Dist_Name() Get_Dist_Name()
@@ -19,13 +14,13 @@ Get_Dist_Name()
} }
Get_Dist_Name Get_Dist_Name
if [ "$DISTRO" = "Deepin" ] || [ "$DISTRO" = "UniontechOS" ];then if [ "$DISTRO" = "Deepin" ] || [ "$DISTRO" = "UniontechOS" ];then
return 1.0 echo 1.0 > ~/.config/spark-wine/scale.txt
#####就是1倍缩放 #####就是1倍缩放
exit exit
fi fi
if [ -f "$1/scale.txt" ];then if [ -f "~/.config/spark-wine/scale.txt" ];then
return `cat $1/scale.txt` echo "设置过了,直接读"
exit exit
fi fi
@@ -40,6 +35,6 @@ zenity --list \
1.25 \ 1.25 \
1.5 \ 1.5 \
2.0 2.0
zenity --info --text="已保存!您可以随时删除$1/scale.txt来重新设置" zenity --info --text="已保存!您可以随时删除~/.config/spark-wine/scale.txt来重新设置"
echo "$?" > $1/scale.txt echo "$?" > ~/.config/spark-wine/scale.txt
return $?