From 042dfaf42fe840f07eb9364a22ecfad5c1d76536 Mon Sep 17 00:00:00 2001 From: RX6900XT Date: Fri, 5 Aug 2022 10:15:09 +0000 Subject: [PATCH 1/4] =?UTF-8?q?update=20spark-dwine-helper/s-wine-helper/d?= =?UTF-8?q?eepinwine/tools/spark=5Frun=5Fv4.sh.=20=E7=94=B1=E4=BA=8E?= =?UTF-8?q?=E9=98=BF=E9=87=8C=E6=97=BA=E6=97=BA=E7=9A=84=E7=9B=B8=E5=BA=94?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=AE=B5=E4=B8=8E=E7=89=88=E6=9C=AC=E5=8F=B7?= =?UTF-8?q?=E6=9C=89=E6=9E=81=E5=A4=A7=E7=9A=84=E8=81=94=E7=B3=BB=EF=BC=8C?= =?UTF-8?q?=E4=B9=9F=E5=B0=B1=E6=98=AF=E8=AF=B4=E7=89=88=E6=9C=AC=E4=B8=80?= =?UTF-8?q?=E5=8D=87=E7=BA=A7=EF=BC=8C=E5=B0=B1=E8=A6=81=E5=9C=A8=E6=AD=A4?= =?UTF-8?q?=E5=A4=84=E6=94=B9=E7=89=88=E6=9C=AC=E5=8F=B7=EF=BC=8C=E6=89=80?= =?UTF-8?q?=E4=BB=A5=E6=97=BA=E6=97=BA10=E4=B8=8D=E6=89=93=E7=AE=97?= =?UTF-8?q?=E8=B5=B0=E6=AD=A4=E4=BC=98=E5=8C=96=E6=AE=B5=EF=BC=8C=E5=8F=96?= =?UTF-8?q?=E8=80=8C=E4=BB=A3=E4=B9=8B=E7=9A=84=E6=98=AF=E7=94=B1=E6=89=93?= =?UTF-8?q?=E5=8C=85=E8=80=85=E7=BC=96=E5=86=99=E4=BC=98=E5=8C=96=E6=AE=B5?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../s-wine-helper/deepinwine/tools/spark_run_v4.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spark-dwine-helper/s-wine-helper/deepinwine/tools/spark_run_v4.sh b/spark-dwine-helper/s-wine-helper/deepinwine/tools/spark_run_v4.sh index 60a3a26..38938dc 100755 --- a/spark-dwine-helper/s-wine-helper/deepinwine/tools/spark_run_v4.sh +++ b/spark-dwine-helper/s-wine-helper/deepinwine/tools/spark_run_v4.sh @@ -443,7 +443,7 @@ CallApp() "Deepin-WeChat") CallWeChat "$@" ;; - "Deepin-WXWork"|"Spark-WeCom") + "Deepin-WXWork") CallWXWork "$@" ;; "Deepin-Dding") -- Gitee From 63f7f00a72ce4ea2af4426a3c67f7ff7479558fb Mon Sep 17 00:00:00 2001 From: RX6900XT Date: Fri, 5 Aug 2022 10:19:47 +0000 Subject: [PATCH 2/4] update spark-dwine-launch/run-template_v1.sh. --- spark-dwine-launch/run-template_v1.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/spark-dwine-launch/run-template_v1.sh b/spark-dwine-launch/run-template_v1.sh index 3c425e4..d654f26 100755 --- a/spark-dwine-launch/run-template_v1.sh +++ b/spark-dwine-launch/run-template_v1.sh @@ -45,7 +45,8 @@ export DEB_PACKAGE_NAME="包名" ####这里写包名才能在启动的时候正确找到files.7z,似乎也和杀残留进程有关 export APPRUN_CMD="deepin-wine6-stable" #####wine启动指令，建议 -EXPORT_ENVS="" +EXPORT_ENVS="wine的动态链接库路径" +##例如我的wine应用是使用的dwine6的32位元容器，那么我要填LD_LIBRARY_PATH=$LD_LIBRARY;/opt/deepin-wine6-stable/lib export SPECIFY_SHELL_DIR=`dirname $START_SHELL_PATH` -- Gitee From 7f1b53695a1f28908cb1e209f05d81e523af96ec Mon Sep 17 00:00:00 2001 From: RX6900XT Date: Fri, 5 Aug 2022 10:24:18 +0000 Subject: [PATCH 3/4] update spark-dwine-helper/s-wine-helper/deepinwine/tools/spark_run_v4.sh. --- .../s-wine-helper/deepinwine/tools/spark_run_v4.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spark-dwine-helper/s-wine-helper/deepinwine/tools/spark_run_v4.sh b/spark-dwine-helper/s-wine-helper/deepinwine/tools/spark_run_v4.sh index 38938dc..60a3a26 100755 --- a/spark-dwine-helper/s-wine-helper/deepinwine/tools/spark_run_v4.sh +++ b/spark-dwine-helper/s-wine-helper/deepinwine/tools/spark_run_v4.sh @@ -443,7 +443,7 @@ CallApp() "Deepin-WeChat") CallWeChat "$@" ;; - "Deepin-WXWork") + "Deepin-WXWork"|"Spark-WeCom") CallWXWork "$@" ;; "Deepin-Dding") -- Gitee From 41ad9f9f58e51eff7254b9d58ec3fdbfb573d42a Mon Sep 17 00:00:00 2001 From: RX6900XT Date: Fri, 5 Aug 2022 10:32:34 +0000 Subject: [PATCH 4/4] update spark-dwine-helper/s-wine-helper/deepinwine/tools/spark_run_v4.sh. --- .../s-wine-helper/deepinwine/tools/spark_run_v4.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spark-dwine-helper/s-wine-helper/deepinwine/tools/spark_run_v4.sh b/spark-dwine-helper/s-wine-helper/deepinwine/tools/spark_run_v4.sh index 60a3a26..150bfa0 100755 --- a/spark-dwine-helper/s-wine-helper/deepinwine/tools/spark_run_v4.sh +++ b/spark-dwine-helper/s-wine-helper/deepinwine/tools/spark_run_v4.sh @@ -422,7 +422,7 @@ CallApp() debug_log "CallApp $BOTTLENAME arg count $#: $*" case $BOTTLENAME in - "Deepin-WangWang"|"AliIm-taobao") + "Deepin-WangWang") CallWangWang "$@" ;; "Deepin-ZhuMu") -- Gitee