wine-runner-linux

2025-01-12 17:48:27 +08:00 · 2022-12-18 13:04:24 +08:00 · 2022-12-18 13:04:24 +08:00 · b7c71130f5
commit b7c71130f5
parent 1e1d3fb352
6 changed files with 38 additions and 18 deletions
--- a/deb/DEBIAN/control
+++ b/deb/DEBIAN/control
@ -1,4 +1,4 @@
-Package: spark-deepin-wine-runner
+Package: wine-runner-linux
 Version: 3.0.0.2
 Maintainer: gfdgd xi <3025613752@qq.com>
 Homepage: https://gitee.com/gfdgd-xi/deep-wine-runner
@ -11,8 +11,8 @@ Priority: optional
 Depends: python3, python3-pil, libc6, python3-pil.imagetk, python3-pyquery, aria2, curl, unrar, unzip, python3-requests, python3-pyqt5, python3-psutil, deepin-terminal | mate-terminal | gnome-terminal | xfce4-terminal, python3-dbus, python3-pip, p7zip-full, sudo
 Recommends: winbind, wimtools, python3-pyqt5.qtwebengine
 Section: utils
-Conflicts: spark.deepin-venturi-setter, spark-deepin-wine5-application-packer, spark-deepin-wine-runner-52
-Replaces: spark.deepin-venturi-setter, spark-deepin-wine5-application-packer, spark-deepin-wine-runner-52
+Conflicts: spark.deepin-venturi-setter, spark-deepin-wine5-application-packer, spark-deepin-wine-runner-52, spark-deepin-wine-runner
+Replaces: spark.deepin-venturi-setter, spark-deepin-wine5-application-packer, spark-deepin-wine-runner-52, spark-deepin-wine-runner
 Installed-Size: 25856
 Description: gfdgd xi、为什么您不喜欢熊出没和阿布呢 制作的 wine 运行器
 3.0.0 更新内容：
--- a/deb/DEBIAN/postinst
+++ b/deb/DEBIAN/postinst
@ -2,7 +2,7 @@
 # 使用系统默认的 sh 运行
 #################################################################################################################
 # 作者：gfdgd xi、为什么您不喜欢熊出没和阿布呢
-# 版本：2.6.0
+# 版本：3.0.0
 # 更新时间：2022年10月02日
 # 感谢：感谢 wine、deepin-wine 以及星火团队，提供了 wine、deepin-wine、spark-wine-devel 给大家使用，让我能做这个程序
 # 基于 sh
--- a/deb/opt/apps/deepin-wine-runner/deepin-wine-runner
+++ b/deb/opt/apps/deepin-wine-runner/deepin-wine-runner
@ -1100,12 +1100,16 @@ class UpdateWindow():
            updateText.setText("从源码运行不提供更新")
            ok.setDisabled(True)
        else:
-            if "deepin/UOS 应用商店版本<带签名>" == programVersionType:
-                url = "aHR0cDovLzEyMC4yNS4xNTMuMTQ0L3NwYXJrLWRlZXBpbi13aW5lLXJ1bm5lci91cGRhdGUtdW9zLmpzb24="
-            elif "星火应用商店版本" == programVersionType:
-                url = "aHR0cDovLzEyMC4yNS4xNTMuMTQ0L3NwYXJrLWRlZXBpbi13aW5lLXJ1bm5lci91cGRhdGUtc3BhcmsuanNvbg=="
+            if newPackage:
+                url = "aHR0cDovLzEyMC4yNS4xNTMuMTQ0L3NwYXJrLWRlZXBpbi13aW5lLXJ1bm5lci91cGRhdGVuZXcuanNvbg=="
            else:
-                url = "aHR0cDovLzEyMC4yNS4xNTMuMTQ0L3NwYXJrLWRlZXBpbi13aW5lLXJ1bm5lci91cGRhdGUuanNvbg=="
+                if "deepin/UOS 应用商店版本<带签名>" == programVersionType:
+                    url = "aHR0cDovLzEyMC4yNS4xNTMuMTQ0L3NwYXJrLWRlZXBpbi13aW5lLXJ1bm5lci91cGRhdGUtdW9zLmpzb24="
+                elif "星火应用商店版本" == programVersionType:
+                    url = "aHR0cDovLzEyMC4yNS4xNTMuMTQ0L3NwYXJrLWRlZXBpbi13aW5lLXJ1bm5lci91cGRhdGUtc3BhcmsuanNvbg=="
+                else: 
+                    url = "aHR0cDovLzEyMC4yNS4xNTMuMTQ0L3NwYXJrLWRlZXBpbi13aW5lLXJ1bm5lci91cGRhdGUuanNvbg=="
+            
            try:
                UpdateWindow.data = json.loads(requests.get(base64.b64decode(url).decode("utf-8")).text)
                versionLabel = QtWidgets.QLabel(f"当前版本：{version}\n最新版本：{UpdateWindow.data['Version']}\n更新内容：")
@ -1934,7 +1938,7 @@ def AddDockerMenu():
    openTerminal.triggered.connect(lambda: threading.Thread(target=os.system, args=[f"x-terminal-emulator"]).start())
    dockers.addAction(openFileManager)
    dockers.addAction(openTerminal)
-
+newPackage = False
 class GetVersionThread(QtCore.QThread):
    signal = QtCore.pyqtSignal(str)
    def __init__(self) -> None:
@ -1943,6 +1947,7 @@ class GetVersionThread(QtCore.QThread):
    def run(self):
        global about
        global window
+        global newPackage
        global programVersionType
        # 目前分为几个版本（在 control 文件区分）：
        # 星火版本：~spark
@ -1977,8 +1982,13 @@ class GetVersionThread(QtCore.QThread):
                    if fileName[i] == "Package: spark-deepin-wine-runner-52":
                        programVersionType = "吾爱专版"
                        window.setWindowTitle(f"{title}（吾爱专版）")
+                        newPackage = False
                        break
                    if fileName[i] == "Package: spark-deepin-wine-runner":
+                        package = True
+                        newPackage = True
+                        continue
+                    if fileName[i] == "Package: wine-runner-linux":
                        package = True
                        continue
                    if not package:
--- a/deb/opt/apps/deepin-wine-runner/package-script.zip
+++ b/deb/opt/apps/deepin-wine-runner/package-script.zip
--- a/mainwindow.py
+++ b/mainwindow.py
@ -1100,12 +1100,16 @@ class UpdateWindow():
            updateText.setText("从源码运行不提供更新")
            ok.setDisabled(True)
        else:
-            if "deepin/UOS 应用商店版本<带签名>" == programVersionType:
-                url = "aHR0cDovLzEyMC4yNS4xNTMuMTQ0L3NwYXJrLWRlZXBpbi13aW5lLXJ1bm5lci91cGRhdGUtdW9zLmpzb24="
-            elif "星火应用商店版本" == programVersionType:
-                url = "aHR0cDovLzEyMC4yNS4xNTMuMTQ0L3NwYXJrLWRlZXBpbi13aW5lLXJ1bm5lci91cGRhdGUtc3BhcmsuanNvbg=="
+            if newPackage:
+                url = "aHR0cDovLzEyMC4yNS4xNTMuMTQ0L3NwYXJrLWRlZXBpbi13aW5lLXJ1bm5lci91cGRhdGVuZXcuanNvbg=="
            else:
-                url = "aHR0cDovLzEyMC4yNS4xNTMuMTQ0L3NwYXJrLWRlZXBpbi13aW5lLXJ1bm5lci91cGRhdGUuanNvbg=="
+                if "deepin/UOS 应用商店版本<带签名>" == programVersionType:
+                    url = "aHR0cDovLzEyMC4yNS4xNTMuMTQ0L3NwYXJrLWRlZXBpbi13aW5lLXJ1bm5lci91cGRhdGUtdW9zLmpzb24="
+                elif "星火应用商店版本" == programVersionType:
+                    url = "aHR0cDovLzEyMC4yNS4xNTMuMTQ0L3NwYXJrLWRlZXBpbi13aW5lLXJ1bm5lci91cGRhdGUtc3BhcmsuanNvbg=="
+                else: 
+                    url = "aHR0cDovLzEyMC4yNS4xNTMuMTQ0L3NwYXJrLWRlZXBpbi13aW5lLXJ1bm5lci91cGRhdGUuanNvbg=="
+            
            try:
                UpdateWindow.data = json.loads(requests.get(base64.b64decode(url).decode("utf-8")).text)
                versionLabel = QtWidgets.QLabel(f"当前版本：{version}\n最新版本：{UpdateWindow.data['Version']}\n更新内容：")
@ -1934,7 +1938,7 @@ def AddDockerMenu():
    openTerminal.triggered.connect(lambda: threading.Thread(target=os.system, args=[f"x-terminal-emulator"]).start())
    dockers.addAction(openFileManager)
    dockers.addAction(openTerminal)
-
+newPackage = False
 class GetVersionThread(QtCore.QThread):
    signal = QtCore.pyqtSignal(str)
    def __init__(self) -> None:
@ -1943,6 +1947,7 @@ class GetVersionThread(QtCore.QThread):
    def run(self):
        global about
        global window
+        global newPackage
        global programVersionType
        # 目前分为几个版本（在 control 文件区分）：
        # 星火版本：~spark
@ -1977,8 +1982,13 @@ class GetVersionThread(QtCore.QThread):
                    if fileName[i] == "Package: spark-deepin-wine-runner-52":
                        programVersionType = "吾爱专版"
                        window.setWindowTitle(f"{title}（吾爱专版）")
+                        newPackage = False
                        break
                    if fileName[i] == "Package: spark-deepin-wine-runner":
+                        package = True
+                        newPackage = True
+                        continue
+                    if fileName[i] == "Package: wine-runner-linux":
                        package = True
                        continue
                    if not package:
--- a/package-script.zip
+++ b/package-script.zip