!9 【轻量级 PR】：Fix: Change %u to %F to avoid low wine version can't resolve file:// protocol

Merge pull request !9 from shenmo/N/A
Fix: Change %u to %F to avoid low wine version can't resolve file:// protocol
2025-12-14 19:12:04 +08:00 · 2024-11-07 14:23:49 +00:00 · 2024-11-07 05:46:22 +00:00 · 2024-11-06 22:08:25 +08:00 · 2024-11-05 13:27:29 +00:00 · 2024-11-04 12:51:01 +08:00
16 changed files with 20 additions and 20 deletions
--- a/.github/workflows/auto-building-rpm.yml
+++ b/.github/workflows/auto-building-rpm.yml
@@ -21,7 +21,7 @@ jobs:
          make package-rpm
          mv spark-deepin-wine-runner*.rpm /home/runner/spark-deepin-wine-runner.rpm
      - name: upload result
-        uses: actions/upload-artifact@v1
+        uses: actions/upload-artifact@v3
        with:
          name: spark-deepin-wine-runner.rpm
          path: /home/runner/spark-deepin-wine-runner.rpm
--- a/.github/workflows/auto-building.yml
+++ b/.github/workflows/auto-building.yml
@@ -30,7 +30,7 @@ jobs:
      - name: Building DEB (termux)
        run: |
          cd deep-wine-runner
-          make package-deb-termux -j4
+          make package-termux-deb -j4
          mv spark-deepin-wine-runner-termux.deb ~
      - name: upload result
        uses: actions/upload-artifact@v3
--- a/.github/workflows/building-off-line-package.yml
+++ b/.github/workflows/building-off-line-package.yml
@@ -70,7 +70,7 @@ jobs:
          cd ..
          xz -T $cpu spark-deepin-wine-runner-off-line.tar
      - name: upload result
-        uses: actions/upload-artifact@v1
+        uses: actions/upload-artifact@v3
        with:
          name: spark-deepin-wine-runner-off-line.tar.xz
          path: /home/runner/spark-deepin-wine-runner-off-line.tar.xz
--- a/deb/DEBIAN/control
+++ b/deb/DEBIAN/control
@@ -18,7 +18,7 @@ Depends: python3,
 python3-requests, 
 python3-pyqt5 | pyqt5, 
 python3-psutil | pypsutil, 
- xfce4-terminal | gxde-terminal | deepin-terminal | mate-terminal | gnome-terminal, 
+ gxde-terminal |xfce4-terminal |  deepin-terminal | mate-terminal | gnome-terminal, 
 python3-dbus, 
 python3-pip | pip, p7zip-full | p7zip-legacy | p7zip, 
 sudo, 
--- a/deb/usr/share/applications/spark-deepin-wine-package-builder.desktop
+++ b/deb/usr/share/applications/spark-deepin-wine-package-builder.desktop
@@ -4,7 +4,7 @@ X-Categories=System;Wine;
 Exec=/usr/bin/deepin-wine-package-builder "~/.wine" %F
 Icon=/opt/apps/deepin-wine-runner/deepin-wine-runner.svg
 Name=Wine Package Builder
-Name[zh]=Wine 打包器
+Name[zh_CN]=Wine 打包器
 Terminal=false
 StartupNotify=true
 NoDisplay=true
--- a/deb/usr/share/applications/spark-deepin-wine-packager-easy-builder.desktop
+++ b/deb/usr/share/applications/spark-deepin-wine-packager-easy-builder.desktop
@@ -4,7 +4,7 @@ X-Categories=System;Wine;
 Exec=/usr/bin/deepin-wine-packager-easy-builder %F
 Icon=/opt/apps/deepin-wine-runner/deepin-wine-runner.svg
 Name=Wine Package Builder
-Name[zh]=Wine 简易打包器
+Name[zh_CN]=Wine 简易打包器
 Terminal=false
 StartupNotify=true
 NoDisplay=true
--- a/deb/usr/share/applications/spark-deepin-wine-packager-with-script.desktop
+++ b/deb/usr/share/applications/spark-deepin-wine-packager-with-script.desktop
@@ -5,6 +5,6 @@ Exec=/usr/bin/deepin-wine-packager-with-script
 Icon=/opt/apps/deepin-wine-runner/deepin-wine-runner.svg
 Name=Wine Package Builder For UOS
 NoDisplay=true
-Name[zh]=Wine 打包器(基于活动脚本)
+Name[zh_CN]=Wine 打包器(基于活动脚本)
 Terminal=false
 StartupNotify=true
--- a/deb/usr/share/applications/spark-deepin-wine-runner-control-vm.desktop
+++ b/deb/usr/share/applications/spark-deepin-wine-runner-control-vm.desktop
@@ -4,7 +4,7 @@ X-Categories=System;Wine;
 Exec=/opt/apps/deepin-wine-runner/RunVM.sh %F
 Icon=/opt/apps/deepin-wine-runner/deepin-wine-runner.svg
 Name=Setting VirtualMachine
-Name[zh]=设置 Windows 虚拟机
+Name[zh_CN]=设置 Windows 虚拟机
 NoDisplay=true
 Terminal=false
 StartupNotify=true
--- a/deb/usr/share/applications/spark-deepin-wine-runner-start-vm.desktop
+++ b/deb/usr/share/applications/spark-deepin-wine-runner-start-vm.desktop
@@ -4,6 +4,6 @@ X-Categories=System;
 Exec=/opt/apps/deepin-wine-runner/StartVM.sh %F
 Icon=/opt/apps/deepin-wine-runner/deepin-wine-runner.svg
 Name=Start Windows VirtualMachine
-Name[zh]=开启 Windows 虚拟机
+Name[zh_CN]=开启 Windows 虚拟机
 Terminal=false
 StartupNotify=true
--- a/deb/usr/share/applications/spark-deepin-wine-runner.desktop
+++ b/deb/usr/share/applications/spark-deepin-wine-runner.desktop
@@ -4,7 +4,7 @@ X-Categories=System;Wine;
 Exec=/usr/bin/deepin-wine-runner %F
 Icon=/opt/apps/deepin-wine-runner/deepin-wine-runner.svg
 Name=Wine Runner
-Name[zh]=Wine 运行器
+Name[zh_CN]=Wine 运行器
 Terminal=false
 StartupNotify=true
 Keywords=exe;scr;
--- a/deepin-wine-easy-packager.py
+++ b/deepin-wine-easy-packager.py
@@ -305,7 +305,7 @@ 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 "C:/windows/command/start.exe" "/Unix" "$EXEC_PATH" "$@"
+        $START_SHELL_PATH $BOTTLENAME $APPVER "$EXEC_PATH" "$@"
    fi
 else
    $START_SHELL_PATH $BOTTLENAME $APPVER "uninstaller.exe" "$@"
@@ -321,7 +321,7 @@ Encoding=UTF-8
 Type=Application
 X-Created-By=@@@Maintainer@@@
 Icon=@@@Icon@@@
-Exec="/opt/apps/@@@Package@@@/files/run.sh"
+Exec="/opt/apps/@@@Package@@@/files/run.sh --uri %F"
 Name=@@@Name@@@
 Comment=@@@Description@@@
 MimeType=
--- a/deepin-wine-packager.py
+++ b/deepin-wine-packager.py
@@ -620,7 +620,7 @@ Description: {e3_text.text()}
            if iconUiList[0][2].text().replace(" ", "") == "":
                command = f"--uri {iconUiList[0][2].text()}"
            else:
-                command = iconUiList[0][2].text()
+                command = f"--uri {iconUiList[0][2].text()}" # 若要传参进入wine容器，必须--uri，否则是传给run.sh的
            replaceMap = [
                ["@@@BOTTLENAME@@@", e5_text.text()],
                ["@@@APPVER@@@", e2_text.text()],
@@ -636,7 +636,7 @@ Description: {e3_text.text()}
                ["@@@MAINTAINER@@@", e4_text.text()],
                ["@@@DESCRIPTION@@@", e3_text.text()],
                ["@@@DESKTOP_EXEC@@@", 
-                 f'''"/opt/apps/{e1_text.text()}/files/run.sh" {command}'''],
+                 f'''"/opt/apps/{e1_text.text()}/files/run.sh" {command} %F'''],
                ["@@@DESKTOP_NAME@@@", iconUiList[0][3].text()],
                ["@@@DESKTOP_MIMETYPE@@@", iconUiList[0][5].text()],
                ["@@@DESKTOP_CATEGORIES@@@", iconUiList[0][1].currentText()]
--- a/information.json
+++ b/information.json
@@ -1,5 +1,5 @@
 {
-    "Version": "4.1.1.1",
+    "Version": "4.1.1.2",
    "Time": "未知",
    "Thank": [
        "感谢 @り哥拽的冇气质° 和 @杨 提供了 3a5000（新世界的测试机器）",
--- a/package-script/information.json
+++ b/package-script/information.json
@@ -1,5 +1,5 @@
 {
-    "Version": "4.1.1.0",
+    "Version": "4.1.1.2",
    "Time": "未知",
    "Thank": [
        "感谢 @り哥拽的冇气质° 和 @杨 提供了 3a5000（新世界的测试机器）",
--- a/package-script/template/run.sh
+++ b/package-script/template/run.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash

 #   Copyright (C) 2016 Deepin, Inc.
 #
@@ -109,7 +109,7 @@ 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 "C:/windows/command/start.exe" "/Unix" "$EXEC_PATH" "$@"
+        $START_SHELL_PATH $BOTTLENAME $APPVER "$EXEC_PATH" "$@"
    fi
 else
    $START_SHELL_PATH $BOTTLENAME $APPVER "uninstaller.exe" "$@"
--- a/packager-config/run.sh
+++ b/packager-config/run.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash

 #   Copyright (C) 2016 Deepin, Inc.
 #
@@ -156,7 +156,7 @@ 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 "C:/windows/command/start.exe" "/Unix" "$EXEC_PATH" "$@"
+        $START_SHELL_PATH $BOTTLENAME $APPVER "$EXEC_PATH" "$@"
    fi
 else
    $START_SHELL_PATH $BOTTLENAME $APPVER "uninstaller.exe" "$@"
Author	SHA1	Message	Date
gfdgd xi	7138c6fbb9	!9 【轻量级 PR】：Fix: Change %u to %F to avoid low wine version can't resolve file:// protocol Some checks failed Auto Building Wine Runner（rpm） / Explore-GitHub-Actions (push) Has been cancelled Details Auto Building Wine Runner（deb） / Explore-GitHub-Actions (push) Has been cancelled Details Building Wine Runner Off-line Pages(arm64) / Explore-GitHub-Actions (push) Has been cancelled Details Building Wine Runner Off-line Pages(amd64) / Explore-GitHub-Actions (push) Has been cancelled Details Merge pull request !9 from shenmo/N/A	2024-11-07 14:23:49 +00:00
shenmo	979c573768	Fix: Change %u to %F to avoid low wine version can't resolve file:// protocol Signed-off-by: shenmo <jifengshenmo@outlook.com>	2024-11-07 05:46:22 +00:00
gfdgd_xi	9ea5e297b6	修复自动构建问题 Some checks are pending Auto Building Wine Runner（rpm） / Explore-GitHub-Actions (push) Waiting to run Details Auto Building Wine Runner（deb） / Explore-GitHub-Actions (push) Waiting to run Details Building Wine Runner Off-line Pages(arm64) / Explore-GitHub-Actions (push) Waiting to run Details Building Wine Runner Off-line Pages(amd64) / Explore-GitHub-Actions (push) Waiting to run Details	2024-11-06 22:08:25 +08:00
gfdgd xi	624b4c8b3a	!7 fix: Can not pass args that starts with `--` && feat: Now add `--uri %u` as default Some checks are pending Auto Building Wine Runner（rpm） / Explore-GitHub-Actions (push) Waiting to run Details Auto Building Wine Runner（deb） / Explore-GitHub-Actions (push) Waiting to run Details Building Wine Runner Off-line Pages(arm64) / Explore-GitHub-Actions (push) Waiting to run Details Building Wine Runner Off-line Pages(amd64) / Explore-GitHub-Actions (push) Waiting to run Details Merge pull request !7 from shenmo/main	2024-11-05 13:27:29 +00:00
shenmo	0c4e736b12	fix: GXDE Deb Installer will install xfce-terminal when installing deb	2024-11-04 12:51:01 +08:00
shenmo	0d0438bddd	bump version to 4112 Signed-off-by: shenmo <jifengshenmo@outlook.com>	2024-11-04 04:44:46 +00:00
shenmo	3fe1ff8a61	fix: i18n fail on GXDE	2024-11-04 08:26:29 +08:00
shenmo	1fe4ed75f4	fix: Can not pass args to exe without --uri Chore: Bump version to 4.1.1.1	2024-11-04 08:19:01 +08:00
shenmo	ebf9474bc6	feat: Now we pass %u as default config	2024-11-04 07:55:46 +08:00
shenmo	d7e131c778	fix: Can not pass '--xxx' options to wine progs	2024-11-04 07:51:41 +08:00