4.1.2

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-arm.yml

@@ -71,7 +71,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

.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;

Model/__init__.py

@@ -13,8 +13,8 @@ programPath = os.path.split(os.path.realpath(__file__))[0]  # 返回 string
 # 优先为深度终端
 terminal = ""
 terminalList = [
-    "deepin-terminal",
     "gxde-terminal",
+    "deepin-terminal",
     "mate-terminal",
     "gnome-terminal",
     "xfce4-terminal"

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/DEBIAN/postinst

@@ -19,12 +19,14 @@ python3 -m pip install --upgrade xpinyin --trusted-host https://repo.huaweicloud
 python3 -m pip install --upgrade pynput --trusted-host https://repo.huaweicloud.com -i https://repo.huaweicloud.com/repository/pypi/simple > /dev/null 2>&1 | true
 python3 -m pip install --upgrade xpinyin --trusted-host https://repo.huaweicloud.com -i https://repo.huaweicloud.com/repository/pypi/simple > /dev/null 2>&1 | true
 # 修改 box86/64 国内源错误数据
-if [ -f /etc/apt/sources.list.d/box64.list ]; then
+sudo rm /etc/apt/sources.list.d/box64.list -rfv
-	sed -i 's/http:\/\/seafile.jyx2048.com:2345/http:\/\/gfdgdxi.v5.idcfengye.com/g' /etc/apt/sources.list.d/box64.list
+sudo rm /etc/apt/sources.list.d/box86.list -rfv
-fi
+#if [ -f /etc/apt/sources.list.d/box64.list ]; then
-if [ -f /etc/apt/sources.list.d/box86.list ]; then
+#	sed -i 's/http:\/\/seafile.jyx2048.com:2345/http:\/\/gfdgdxi.v5.idcfengye.com/g' /etc/apt/sources.list.d/box64.list
-	sed -i 's/http:\/\/seafile.jyx2048.com:2345/http:\/\/gfdgdxi.v5.idcfengye.com/g' /etc/apt/sources.list.d/box86.list
+#fi
-fi
+#if [ -f /etc/apt/sources.list.d/box86.list ]; then
+#	sed -i 's/http:\/\/seafile.jyx2048.com:2345/http:\/\/gfdgdxi.v5.idcfengye.com/g' /etc/apt/sources.list.d/box86.list
+#fi
 echo 执行完成
 echo 移除旧组件
 if [ -d /opt/apps/deepin-wine-runner/arm-package ]; then
@@ -60,6 +62,6 @@ if [[ `arch` != "x86_64" ]]; then
 	rm -rf /opt/apps/deepin-wine-runner/InstallNewWineHQ.sh
 fi
 # 设置目录权限，让用户可读可写，方便后续删除组件
-chmod 777 -R /opt/apps/deepin-wine-runner > /dev/null 2>&1 | true
+#chmod 777 -R /opt/apps/deepin-wine-runner > /dev/null 2>&1 | true
 # 向服务器返回安装数加1（不显示内容且忽略错误）
 python3 /opt/apps/deepin-wine-runner/Download.py $version > /dev/null 2>&1 | true

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()]
@@ -1356,6 +1356,15 @@ try:
             wine[f"{programPath}/wine/{i}"] = f"{programPath}/wine/{i}"
 except:
     pass
+try:
+    for i in json.loads(readtxt(f"{get_home()}/.deepwinerunner/wine/winelist.json")):
+        if os.path.exists(f"{get_home()}/.deepwinerunner/wine/{i}.7z"):
+            wine[f"{get_home()}/.deepwinerunner/wine/{i}.7z"] = f"{get_home()}/.deepwinerunner/wine/{i}.7z"
+            continue
+        if os.path.exists(f"{get_home()}/.deepwinerunner/wine/{i}"):
+            wine[f"{get_home()}/.deepwinerunner/wine/{i}"] = f"{get_home()}/.deepwinerunner/wine/{i}"
+except:
+    pass
 os.chdir("/")
 iconUiList = []
 helperConfigPath = None

information.json

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

mainwindow.py

@@ -2162,6 +2162,20 @@ def TransLog():
 # 加载配置
 ###########################
 
+if not os.path.exists(get_home() + "/.deepwinerunner/wine/"):  # 如果没有配置文件夹
+    os.makedirs(get_home() + "/.deepwinerunner/wine/")  # 创建配置文件夹
+try:
+    shutil.copy(f"{programPath}/wine/installwine.py", get_home() + "/.deepwinerunner/wine/installwine.py")
+    shutil.copy(f"{programPath}/globalenv.py", get_home() + "/.deepwinerunner/globalenv.py")
+    shutil.copy(f"{programPath}/launch.sh", get_home() + "/.deepwinerunner/launch.sh")
+    if os.path.exists(get_home() + "/.deepwinerunner/Model"):
+        shutil.rmtree(get_home() + "/.deepwinerunner/Model")
+    shutil.copytree(f"{programPath}/Model", get_home() + "/.deepwinerunner/Model")
+    os.system(f"chmod 777 -Rv '{get_home()}/.deepwinerunner/launch.sh'")
+except:
+    traceback.print_exc()
+    exit()
+
 if not os.path.exists(get_home() + "/.config/"):  # 如果没有配置文件夹
     os.mkdir(get_home() + "/.config/")  # 创建配置文件夹
 if not os.path.exists(get_home() + "/.config/deepin-wine-runner"):  # 如果没有配置文件夹
@@ -2304,9 +2318,10 @@ def CheckWine():
                 traceback.print_exc()    
 
             # 不再从列表读取，直接读目录
-            for i in os.listdir(f"{programPath}/wine/"):
+            for i in os.listdir(f"{programPath}/wine/") + os.listdir(f"{get_home()}/.deepwinerunner/wine/"):
             #for i in json.loads(readtxt(f"{programPath}/wine/winelist.json")):
-                if os.path.exists(f"{programPath}/wine/{i}") and os.path.isdir(f"{programPath}/wine/{i}"):
+                if ((os.path.exists(f"{programPath}/wine/{i}") and os.path.isdir(f"{programPath}/wine/{i}")) or
+                    (os.path.exists(f"{get_home()}/.deepwinerunner/wine/{i}") and os.path.isdir(f"{get_home()}/.deepwinerunner/wine/{i}"))):
                     name = ""
                     qemuInstall = False
                     nameValue = [["", ""]]
@@ -2394,6 +2409,10 @@ def CheckWine():
                                 wine[f"{k[0]}{chrootProgramPath}/wine/{i}/bin/{j}"] = f"{k[1]}{chrootProgramPath}/wine/{i}/bin/{j}"
                                 canUseWine.append(f"{k[0]}{chrootProgramPath}/wine/{i}/bin/{j}")
                                 untipsWine.append(f"{k[0]}{chrootProgramPath}/wine/{i}/bin/{j}")
+                            if os.path.exists(f"{get_home()}/.deepwinerunner/wine/{i}/bin/{j}"):        
+                                wine[f"{k[0]}{get_home()}/.deepwinerunner/wine/{i}/bin/{j}"] = f"{k[1]}{get_home()}/.deepwinerunner/wine/{i}/bin/{j}"
+                                canUseWine.append(f"{k[0]}{get_home()}/.deepwinerunner/wine/{i}/bin/{j}")
+                                untipsWine.append(f"{k[0]}{get_home()}/.deepwinerunner/wine/{i}/bin/{j}")
             
         except:
             traceback.print_exc()
@@ -2478,10 +2497,9 @@ exe路径\' 参数 \'
 5、wine 容器如果没有指定，则会默认为 ~/.wine；
 6、如果可执行文件比较大的话，会出现点击“获取该程序运行情况”出现假死的情况，因为正在后台读取 SHA1，只需要等一下即可（读取速度依照您电脑处理速度、读写速度、可执行文件大小等有关）；
 7、如果非 X86 的用户的 UOS 专业版用户想要使用的话，只需要在应用商店安装一个 Wine 版本微信即可在本程序选择正确的 Wine 运行程序；''')
-updateThingsString = QtCore.QCoreApplication.translate("U", '''※1、修复没有 dxvk 的问题
+updateThingsString = QtCore.QCoreApplication.translate("U", '''※1、修复安全问题
-※2、修复虚拟机功能异常的问题（https://gitee.com/gfdgd-xi/deep-wine-runner/issues/IASRHG）
+※2、更新 dxvk 版本至 2.5
-※3、修复打包器生成的 deb 不可用的问题（https://gitee.com/gfdgd-xi/deep-wine-runner/issues/IAXE1T）
+※3、修复打包器生成的 deb 包参数问题                                                                                          
-※4、打包器针对 GXDE OS 进行优化
 ''')
 for i in information["Thank"]:
     thankText += f"{i}\n"
@@ -2834,7 +2852,7 @@ installWineHQ.triggered.connect(InstallWineHQ)
 installWineHQOrg.triggered.connect(lambda: threading.Thread(target=OpenTerminal, args=[f"{programPath}/InstallNewWineHQOrg.sh"]).start())
 installLat.triggered.connect(lambda: threading.Thread(target=OpenTerminal, args=[f"{programPath}/InstallLat.sh"]).start())
 def InstallMoreWine():
-    os.system(f"'{programPath}/wine/installwine'")
+    os.system(get_home() + "/.deepwinerunner/wine/installwine.py")
     # 更新 Wine 列表
     CheckWine()
     o1.clear()

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