!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

.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

.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

.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

DesktopIcon/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;

VM/qemu.py

@@ -35,7 +35,7 @@ class qemu:
     def CreateDisk(self, path: str, size: int):
         if(os.path.exists(path)):
             return 0
-        return os.system(("qemu-img create -f qcow2 '" + self.path + "' " + str(size) + "M"))
+        return os.system(("qemu-img create -f qcow2 '" + path + "' " + str(size) + "M"))
 
     def CreateDiskControl(self, controlName = "storage_controller_1"):
         return 0

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, 

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

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

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

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

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

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;

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=

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()]

information.json

@@ -1,5 +1,5 @@
 {
-    "Version": "4.1.1.0",
+    "Version": "4.1.1.2",
     "Time": "未知",
     "Thank": [
         "感谢 @り哥拽的冇气质° 和 @杨 提供了 3a5000（新世界的测试机器）",

mainwindow.py

@@ -2482,6 +2482,8 @@ updateThingsString = QtCore.QCoreApplication.translate("U", '''※1、修复没
 ※2、修复虚拟机功能异常的问题（https://gitee.com/gfdgd-xi/deep-wine-runner/issues/IASRHG）
 ※3、修复打包器生成的 deb 不可用的问题（https://gitee.com/gfdgd-xi/deep-wine-runner/issues/IAXE1T）
 ※4、打包器针对 GXDE OS 进行优化
+※5、修复虚拟机因无法创建磁盘导致崩溃的问题
+※6、修复中文问题                                                  
 ''')
 for i in information["Thank"]:
     thankText += f"{i}\n"

package-script/information.json

@@ -1,5 +1,5 @@
 {
-    "Version": "4.1.1.0",
+    "Version": "4.1.1.2",
     "Time": "未知",
     "Thank": [
         "感谢 @り哥拽的冇气质° 和 @杨 提供了 3a5000（新世界的测试机器）",

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" "$@"

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" "$@"