Compare commits

...

8 Commits
1.7.3 ... 1.8

Author SHA1 Message Date
75df70235a Unix转Dos路径,修复部分应用不支持Linux路径(跟进 deepin-wine-helper) 2022-10-13 22:52:30 +08:00
c7f510202d 错别字
Signed-off-by: shenmo <jifengshenmo@outlook.com>
2022-10-11 12:34:35 +00:00
de07b48d36 Deepin-QQ-Spark 优化段加入 2022-10-11 15:58:21 +08:00
18fed0ace9 update spark-dwine-helper/build.sh.
Signed-off-by: shenmo <jifengshenmo@outlook.com>
2022-10-08 11:51:46 +00:00
b4e5f8d74f IE8 优化段 新增 2022-10-01 23:34:56 +08:00
RX6900XT
452caaa5da !11 加入tim
* update spark-dwine-helper/s-wine-helper/deepinwine/tools/spark_run_v4.sh.
2022-09-29 03:12:29 +00:00
c14bc5081f 在run.sh模板中新增ENABLE_DOT_NET相关设置 @gfd 2022-09-09 13:41:44 +08:00
b6695cbd37 设置助手 新增 支持一键刷新所有缩放设置到与系统同步 2022-09-09 13:32:13 +08:00
4 changed files with 53 additions and 11 deletions

View File

@@ -30,6 +30,7 @@ Section: utils
Priority: extra
Recommends: spark-dwine-helper-settings
Multi-Arch: foreign
Provides: store.spark-app.spark-dwine-helper(=$version)
Replaces: store.spark-app.spark-dwine-helper(<=$version)
Homepage: https://gitee.com/deepin-community-store/spark-wine
Description: Spark Deepin Wine Helper
@@ -111,7 +112,7 @@ SIZE=`echo ${SIZE%%.*}`
cat << EOF >pkg/DEBIAN/control
Package: spark-dwine-helper-settings
Version: 1.1
Version: 1.2
Architecture: all
Maintainer: shenmo <shenmo@spark-app.store>
Installed-Size: $SIZE

View File

@@ -142,7 +142,7 @@ CallProcess()
if [ -n "$MIME_TYPE" ]; then
xdg-mime default "$DEB_PACKAGE_NAME".desktop "$MIME_TYPE"
fi
# Unuse winemenubuilder
# Disable winemenubuilder
env WINEPREFIX="$WINEPREFIX" $WINE_CMD reg add 'HKEY_CURRENT_USER\Software\Wine\DllOverrides' /v winemenubuilder.exe /f
debug_log_to_file "Starting process $* ..."
############# WARNING: Here is the modified content: Now will run set-dwine-scale.sh
@@ -391,6 +391,8 @@ CallQQGameV2()
CallProcess "$1" -action:force_download -appid:${2} -pid:8 -bin_version:1.1.2.4 -loginuin:
}
CallPsCs6()
{
#get file full path
@@ -417,13 +419,30 @@ CallPsCs6()
CallProcess "$@"
}
CallIE8()
{
rm -f "$WINEPREFIX/system.reg"
cp $APPDIR/system.reg "$WINEPREFIX/system.reg"
CallProcess "$@"
}
#####专属优化段结束
UnixUriToDosPath()
{
OPEN_FILE="$1"
if [ -f "$OPEN_FILE" ]; then
OPEN_FILE=$(realpath "$OPEN_FILE")
OPEN_FILE="z:$OPEN_FILE"
OPEN_FILE=$(echo $OPEN_FILE | sed -e 's/\//\\\\/g')
fi
echo $OPEN_FILE
}
#arg 1: exec file path
#arg 2: autostart ,or exec arg 1
#arg 3: exec arg 2
#### CallApp段根据容器名找专属优化没有就走通用启动
CallApp()
{
@@ -437,10 +456,10 @@ CallApp()
"Deepin-ZhuMu")
CallZhuMu "$@"
;;
"Deepin-QQ"|"Wine-QQ"|"Spark-QQ")
"Deepin-QQ"|"Wine-QQ"|"Spark-QQ"|"Deepin-QQ-Spark")
CallQQ "$@"
;;
"Deepin-TIM")
"Deepin-TIM"|"Spark-TIM")
CallTIM "$@"
;;
"Deepin-QQGame"*)
@@ -500,6 +519,9 @@ CallApp()
"Spark-douyin")
CallDouyin "$@"
;;
"IE8")
CallIE8 "$@"
;;
*)
CallProcess "$@"
;;
@@ -589,10 +611,14 @@ ParseArgs()
{
if [ $# -eq 4 ];then
RunApp "$3"
elif [ $# -eq 5 ];then
RunApp "$3" "$5"
elif [ -f "$5" ];then
if [ -n "$MIME_EXEC" ];then
RunApp "$MIME_EXEC" "$(UnixUriToDosPath "$5")" "${@:6}"
else
RunApp "$3" "$(UnixUriToDosPath "$5")" "${@:6}"
fi
else
RunApp "$3" "$5" "$6"
RunApp "$3" "${@:5}"
fi
}

View File

@@ -10,6 +10,7 @@ CHOSEN_SETTINGS=`zenity --list \
--column="操作" \
设置全局缩放 \
设置单独应用缩放 \
一键将所有已安装应用的缩放设置改为与全局缩放一致 \
备注以上操作仅对使用了spark-dwine-helper的应用生效 `
echo "$CHOSEN_SETTINGS"
@@ -88,6 +89,10 @@ esac
fi
;;
"一键将所有已安装应用的缩放设置改为与全局缩放一致")
find ${HOME}/.deepinwine/ -name "scale.txt" -type f -print -exec rm -rf {} \;
zenity --info --text="以下容器中的应用的缩放设置已与全局设置同步:\n`cd ${HOME}/.deepinwine/ && ls`" --width=500 --height=150
;;
"以上操作仅对使用了spark-dwine-helper的应用生效")

View File

@@ -39,14 +39,16 @@ APPVER="版本号"
EXEC_PATH="启动路径"
##### 软件在wine中的启动路径
START_SHELL_PATH="/opt/deepinwine/tools/spark_run_v4.sh"
ENABLE_DOT_NET=""
####若使用spark-wine7-devel时需要用到.net则请把ENABLE_DOT_NET设为true同时在依赖中写spark-wine7-mono
export MIME_TYPE=""
#####没什么用
export DEB_PACKAGE_NAME="包名"
####这里写包名才能在启动的时候正确找到files.7z,似乎也和杀残留进程有关
export APPRUN_CMD="deepin-wine6-stable"
#####wine启动指令建议
#EXPORT_ENVS="wine的动态链接库路径"
##例如我的wine应用是使用的dwine6的32位容器那么我要填LD_LIBRARY_PATH=$LD_LIBRARY;/opt/deepin-wine6-stable/lib
##例如我的wine应用是使用的dwine6的32位容器那么我要填LD_LIBRARY_PATH=$LD_LIBRARY;/opt/deepin-wine6-stable/lib
## 如果用不到就不填,不要删除前面的注释用的#
export SPECIFY_SHELL_DIR=`dirname $START_SHELL_PATH`
@@ -65,7 +67,7 @@ DISABLE_ATTACH_FILE_DIALOG=""
##############<<<<<<<<<禁用文件选择工具开始
Get_Dist_Name
#此功能实现参见结尾函数段
#此功能实现参见开头函数段
if [ "$DISTRO" != "Deepin" ] && [ "$DISTRO" != "UniontechOS" ];then
DISABLE_ATTACH_FILE_DIALOG="1"
echo "非deepin/UOS默认关闭系统自带的文件选择工具使用Wine的"
@@ -75,7 +77,15 @@ echo "To用户打包者没有打开这个功能这证明启用这个功能
fi
##############>>>>>>>>>禁用文件选择工具结束
##############<<<<<<<<<屏蔽mono和gecko安装器开始
##默认屏蔽mono和gecko安装器
if [ "$APPRUN_CMD" = "spark-wine7-devel" ] && [ -z "$ENABLE_DOT_NET"];then
export WINEDLLOVERRIDES="mscoree,mshtml="
#### "为了降低打包体积默认关闭gecko和momo如有需要注释此行仅对spark-wine7-devel有效"
fi
##############>>>>>>>>>屏蔽mono和gecko安装器结束
#########################执行段