From b7c71130f50cc2851c6b75d93845ff05cc888c9d Mon Sep 17 00:00:00 2001 From: gfdgd_xi <3025613752@qq.com> Date: Sun, 18 Dec 2022 13:04:24 +0800 Subject: [PATCH] wine-runner-linux --- deb/DEBIAN/control | 6 ++--- deb/DEBIAN/postinst | 2 +- .../deepin-wine-runner/deepin-wine-runner | 24 +++++++++++++----- .../deepin-wine-runner/package-script.zip | Bin 306745 -> 306745 bytes mainwindow.py | 24 +++++++++++++----- package-script.zip | Bin 306745 -> 306745 bytes 6 files changed, 38 insertions(+), 18 deletions(-) diff --git a/deb/DEBIAN/control b/deb/DEBIAN/control index e9cb70c..f506662 100755 --- 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 更新内容： diff --git a/deb/DEBIAN/postinst b/deb/DEBIAN/postinst index 23087e1..a59eec5 100755 --- 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 diff --git a/deb/opt/apps/deepin-wine-runner/deepin-wine-runner b/deb/opt/apps/deepin-wine-runner/deepin-wine-runner index a3e8b1a..5237485 100755 --- 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==" - else: - url = "aHR0cDovLzEyMC4yNS4xNTMuMTQ0L3NwYXJrLWRlZXBpbi13aW5lLXJ1bm5lci91cGRhdGUuanNvbg==" + if newPackage: + url = "aHR0cDovLzEyMC4yNS4xNTMuMTQ0L3NwYXJrLWRlZXBpbi13aW5lLXJ1bm5lci91cGRhdGVuZXcuanNvbg==" + else: + 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: diff --git a/deb/opt/apps/deepin-wine-runner/package-script.zip b/deb/opt/apps/deepin-wine-runner/package-script.zip index 9e1840b4d424b71fac2816186997d56b7f560e39..af614f66a6c2f8693d465bb02f0a91a31f601f7a 100755 GIT binary patch delta 436 zcmdmaM`-6Ap$TRzTV~8lo<8vxqww_lUKX~=8@N~|hMO^0%$&Dz0y7t;tOZDF@@uYd zVEPI7VKBXlCk#YyX6EH#0t*Q7?*|K9;eRCoVl*Gr*nUuh@$oK96IrGoeavVMQnda5 zW5$oX*i=|8VBwoC|B2BQtStN!V-(n$?OVPu3V>PDkAGvF4VFy(&S=g8Vztlz&A5I3 zZ>G0_Al~$TU*>GEg1^4ZG0b3AOdzu=gw+zl%q|2L>q}!^Cy31nu@%e^+ox7A3owG! zuBc?*2VrGaGuwk%(^uCpzXD0N&!}bIKBJc9JQrALRtL*%Ml@rmCv~ydf@K$Vu^eMU Um5l~V-0fwF1bb$=_< zn0~^27)-C?2?NoanR$7bzyd=2`@sTN_+LqY7|jPYwjb1Be7p" == programVersionType: - url = "aHR0cDovLzEyMC4yNS4xNTMuMTQ0L3NwYXJrLWRlZXBpbi13aW5lLXJ1bm5lci91cGRhdGUtdW9zLmpzb24=" - elif "星火应用商店版本" == programVersionType: - url = "aHR0cDovLzEyMC4yNS4xNTMuMTQ0L3NwYXJrLWRlZXBpbi13aW5lLXJ1bm5lci91cGRhdGUtc3BhcmsuanNvbg==" - else: - url = "aHR0cDovLzEyMC4yNS4xNTMuMTQ0L3NwYXJrLWRlZXBpbi13aW5lLXJ1bm5lci91cGRhdGUuanNvbg==" + if newPackage: + url = "aHR0cDovLzEyMC4yNS4xNTMuMTQ0L3NwYXJrLWRlZXBpbi13aW5lLXJ1bm5lci91cGRhdGVuZXcuanNvbg==" + else: + 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: diff --git a/package-script.zip b/package-script.zip index 9e1840b4d424b71fac2816186997d56b7f560e39..af614f66a6c2f8693d465bb02f0a91a31f601f7a 100755 GIT binary patch delta 436 zcmdmaM`-6Ap$TRzTV~8lo<8vxqww_lUKX~=8@N~|hMO^0%$&Dz0y7t;tOZDF@@uYd zVEPI7VKBXlCk#YyX6EH#0t*Q7?*|K9;eRCoVl*Gr*nUuh@$oK96IrGoeavVMQnda5 zW5$oX*i=|8VBwoC|B2BQtStN!V-(n$?OVPu3V>PDkAGvF4VFy(&S=g8Vztlz&A5I3 zZ>G0_Al~$TU*>GEg1^4ZG0b3AOdzu=gw+zl%q|2L>q}!^Cy31nu@%e^+ox7A3owG! zuBc?*2VrGaGuwk%(^uCpzXD0N&!}bIKBJc9JQrALRtL*%Ml@rmCv~ydf@K$Vu^eMU Um5l~V-0fwF1bb$=_< zn0~^27)-C?2?NoanR$7bzyd=2`@sTN_+LqY7|jPYwjb1Be7p