diff --git a/spark-dwine-helper/pkg/DEBIAN/control b/spark-dwine-helper/pkg/DEBIAN/control index 0ad1cb5..93b9b3b 100644 --- a/spark-dwine-helper/pkg/DEBIAN/control +++ b/spark-dwine-helper/pkg/DEBIAN/control @@ -1,5 +1,5 @@ Package: spark-dwine-helper -Version: 1.4 +Version: 1.4.1 Architecture: all Maintainer: shenmo Installed-Size: 2293 diff --git a/spark-dwine-helper/pkg/opt/deepinwine/tools/spark_run_v4.sh b/spark-dwine-helper/pkg/opt/deepinwine/tools/spark_run_v4.sh index ff88856..b0cfbf2 100755 --- a/spark-dwine-helper/pkg/opt/deepinwine/tools/spark_run_v4.sh +++ b/spark-dwine-helper/pkg/opt/deepinwine/tools/spark_run_v4.sh @@ -17,6 +17,7 @@ APPVER="@deb_version_string@" APPTAR="files.7z" BOTTLENAME="" WINE_CMD="deepin-wine" +#这里会被后续覆盖,似乎没啥用 LOG_FILE=$0 PUBLIC_DIR="/var/public" @@ -427,7 +428,7 @@ CallApp() "Deepin-ZhuMu") CallZhuMu "$@" ;; - "Deepin-QQ"|"Wine-QQ") + "Deepin-QQ"|"Wine-QQ"|"Spark-QQ") CallQQ "$@" ;; "Deepin-TIM") diff --git a/spark-dwine-helper/pkg/opt/durapps/spark-dwine-helper/spark-get-scale.sh b/spark-dwine-helper/pkg/opt/durapps/spark-dwine-helper/spark-get-scale.sh index 73d9716..6e15f84 100755 --- a/spark-dwine-helper/pkg/opt/durapps/spark-dwine-helper/spark-get-scale.sh +++ b/spark-dwine-helper/pkg/opt/durapps/spark-dwine-helper/spark-get-scale.sh @@ -9,9 +9,11 @@ Get_Dist_Name() DISTRO='Deepin' elif grep -Eqi "Uniontech" /etc/issue || grep -Eq "Uniontech" /etc/*-release; then DISTRO='UniontechOS' - + else + DISTRO='OtherOS' fi } + Get_Dist_Name if [ "$DISTRO" = "Deepin" ] || [ "$DISTRO" = "UniontechOS" ];then echo 1.0 > ~/.config/spark-wine/scale.txt diff --git a/spark-dwine-launch/run-template_v1.sh b/spark-dwine-launch/run-template_v1.sh new file mode 100755 index 0000000..9f85644 --- /dev/null +++ b/spark-dwine-launch/run-template_v1.sh @@ -0,0 +1,95 @@ +#!/bin/sh + +# Copyright (C) 2016 Deepin, Inc. +# +# Author: Li LongYu +# Peng Hao +# +# +# Copyright (C) 2022 The Spark Project +# +# +# Modifier shenmo +# +# +# + +#########################预设值段 + +version_gt() { test "$(echo "$@" | tr " " "\n" | sort -V | head -n 1)" != "$1"; } +####用于比较版本?未实装 +BOTTLENAME="容器名" +APPVER="版本号" +EXEC_PATH="启动路径" +##### 软件在wine中的启动路径 +START_SHELL_PATH="/opt/deepinwine/tools/spark_run_v4.sh" +export MIME_TYPE="" +#####没什么用 +export DEB_PACKAGE_NAME="包名" +####这里写包名才能在启动的时候正确找到files.7z,似乎也和杀残留进程有关 +export APPRUN_CMD="deepin-wine6-stable" +#####wine启动指令,建议 +EXPORT_ENVS="" + +export SPECIFY_SHELL_DIR=`dirname $START_SHELL_PATH` + +ARCHIVE_FILE_DIR="/opt/apps/$DEB_PACKAGE_NAME/files" + +export WINEDLLPATH=/opt/$APPRUN_CMD/lib:/opt/$APPRUN_CMD/lib64 + +export WINEPREDLL="$ARCHIVE_FILE_DIR/dlls" + +DISABLE_ATTACH_FILE_DIALOG="" +##默认为空。若为1,则不使用系统自带的文件选择,而是使用wine的 +##对于deepin/UOS,大部分的应用都不需要使用wine的,如果有需求(比如wine应用选择的限定种类文件系统的文管不支持) +##请填1。 +##注意:因为非DDE的环境不确定,所以默认会在非Deepin/UOS发行版上禁用这个功能。如果你确认在适配的发行版上可以正常启动,请注释或者删除下面这段 + +##############<<<<<<<<<禁用文件选择工具开始 +Get_Dist_Name +#此功能实现参见结尾函数段 +if [ "$DISTRO" != "Deepin" ] && [ "$DISTRO" != "UniontechOS" ];then +DISABLE_ATTACH_FILE_DIALOG="1" +echo "非deepin/UOS,默认关闭系统自带的文件选择工具,使用Wine的" +echo "如果你想改变这个行为,请到/opt/apps/$DEB_PACKAGE_NAME/files/$0处修改" +echo "To打包者:如果你要打开自带请注意在适配的发行版上进行测试" +echo "To用户:打包者没有打开这个功能,这证明启用这个功能可能造成运行问题。如果你要修改这个行为,请确保你有一定的动手能力" +fi +##############>>>>>>>>>禁用文件选择工具结束 + + +#########################执行段 + +if [ -z "$DISABLE_ATTACH_FILE_DIALOG" ];then + export ATTACH_FILE_DIALOG=1 +fi + +if [ -n "$EXPORT_ENVS" ];then + export $EXPORT_ENVS +fi + +if [ -n "$EXEC_PATH" ];then + if [ -z "${EXEC_PATH##*.lnk*}" ];then + $START_SHELL_PATH $BOTTLENAME $APPVER "C:/windows/command/start.exe" "/Unix" "$EXEC_PATH" "$@" + else + $START_SHELL_PATH $BOTTLENAME $APPVER "$EXEC_PATH" "$@" + fi +else + $START_SHELL_PATH $BOTTLENAME $APPVER "uninstaller.exe" "$@" +fi + + +#######################函数段。上文调用的额外功能会在此处声明 + +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 + DISTRO='UniontechOS' + else + DISTRO='OtherOS' + fi +} + +####获得发行版名称 \ No newline at end of file