gfdgd-xi/deep-wine-runner
gfdgd-xi/deep-wine-runner
1
0
Fork 0
mirror of https://gitee.com/gfdgd-xi/deep-wine-runner synced 2025-01-13 01:58:27 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

细节微调

Browse Source
This commit is contained in:
gfdgd xi 2022-11-28 07:35:59 +08:00
parent d78916f4b0
commit 43e473ad39
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
README.md
View File

@ -103,6 +103,9 @@ desktop文件中StartupWMClass字段。用于让桌面组件将窗口类名与de
![image.png](https://storage.deepin.org/thread/202207190822204627_image.png) ![image.png](https://storage.deepin.org/thread/202207190822204627_image.png)
## 更新日志 ## 更新日志
### 2.5.0.1（2022年11月25日）
**※1、修复已知问题**
### 2.5.0（2022年11月25日） ### 2.5.0（2022年11月25日）
**※1、容器自动配置脚本 GUI 查看介绍使用 QWebEngineWidget，支持图片（非强制依赖，只做推荐）；** **※1、容器自动配置脚本 GUI 查看介绍使用 QWebEngineWidget，支持图片（非强制依赖，只做推荐）；**
**※2、不基于生态适配活动脚本打包器跟进 arm 架构 2022年11月11日的 Wine 微信打包方式；** **※2、不基于生态适配活动脚本打包器跟进 arm 架构 2022年11月11日的 Wine 微信打包方式；**

9
deepin-wine-easy-packager.py
View File

@ -388,6 +388,7 @@ class RunThread(QtCore.QThread):
def run(self): def run(self):
try: try:
self.disbledAll.emit(True)
if not self.QuestionMsg("在此过程中，需要回答一系列的问题以进行打包，点击确定继续"): if not self.QuestionMsg("在此过程中，需要回答一系列的问题以进行打包，点击确定继续"):
self.disbledAll.emit(False) self.disbledAll.emit(False)
return return
@ -417,13 +418,16 @@ class RunThread(QtCore.QThread):
self.RunCommand(f"mkdir -pv '{bottlePath}'") self.RunCommand(f"mkdir -pv '{bottlePath}'")
self.RunCommand(f"chmod 777 -Rv '{bottlePath}'") self.RunCommand(f"chmod 777 -Rv '{bottlePath}'")
# 安装包 # 安装包
self.RunCommand(f"WINEPREFIX='{bottlePath}' deepin-wine6-stable '{exePath.text()}'")
global pressCompleteDownload global pressCompleteDownload
pressCompleteDownload = False pressCompleteDownload = False
installCmpleteButton.setEnabled(True) installCmpleteButton.setEnabled(True)
self.RunCommand(f"WINEPREFIX='{bottlePath}' deepin-wine6-stable '{exePath.text()}' &") # 非堵塞线程
# 安装锁，锁解除后才可继续 # 安装锁，锁解除后才可继续
while not pressCompleteDownload: while not pressCompleteDownload:
time.sleep(0.1) time.sleep(0.1)
# 杀死容器内应用
self.RunCommand(f"'{programPath}/kill.sh' '{os.path.basename(bottlePath)}'")
# 识别 lnk # 识别 lnk
lnkList = GetLnkDesktop(lnkPath) lnkList = GetLnkDesktop(lnkPath)
if len(lnkList) <= 0: if len(lnkList) <= 0:
@ -434,7 +438,7 @@ class RunThread(QtCore.QThread):
secondChooseList = [] secondChooseList = []
for k in lnkList: for k in lnkList:
lnkPath = k[0].lower() lnkPath = k[0].lower()
if "卸载" in lnkPath or "uninstall" in lnkPath or "update" in lnkPath: if "卸载" in lnkPath or "uninstall" in lnkPath or "update" in lnkPath or "网页" in lnkPath or "websize" in lnkPath:
continue continue
secondChooseList.append(k) secondChooseList.append(k)
if len(secondChooseList) <= 0: if len(secondChooseList) <= 0:
@ -516,6 +520,7 @@ class RunThread(QtCore.QThread):
self.RunCommand(f"chmod -Rv 755 '{debBuildPath}/opt/apps/{debPackageName}/files/'*.sh") self.RunCommand(f"chmod -Rv 755 '{debBuildPath}/opt/apps/{debPackageName}/files/'*.sh")
self.RunCommand(f"chmod -Rv 755 '{debBuildPath}/opt/apps/{debPackageName}/entries/applications/'*.desktop") self.RunCommand(f"chmod -Rv 755 '{debBuildPath}/opt/apps/{debPackageName}/entries/applications/'*.desktop")
########### 打包 deb ########### 打包 deb
print(debPackageVersion)
self.RunCommand(f"dpkg -b '{debBuildPath}' '{desktopPath}/{debPackageName}_{debPackageVersion}_i386.deb'") self.RunCommand(f"dpkg -b '{debBuildPath}' '{desktopPath}/{debPackageName}_{debPackageVersion}_i386.deb'")
self.info.emit("打包完成！") self.info.emit("打包完成！")
self.disbledAll.emit(False) self.disbledAll.emit(False)