diff --git a/InstallWineOnDeepin23.py b/InstallWineOnDeepin23.py index 1c82677..8d06ff6 100755 --- a/InstallWineOnDeepin23.py +++ b/InstallWineOnDeepin23.py @@ -18,6 +18,7 @@ def InstallWithDeepinSource(program): os.system(f"sudo apt update") os.system(f"sudo apt install {program}") os.system(f"sudo rm /etc/apt/sources.list.d/deepin20-withwinerunner.list") + os.system(f"sudo apt update") os.system(f"sudo dpkg --remove-architecture i386") os.system(f"sudo apt update") @@ -29,10 +30,11 @@ def InstallWithSparkStoreSource(program): os.system(f"sudo rm -rf /tmp/spark-store-install/spark-store.asc") os.system(f"sudo wget -O /tmp/spark-store-install/spark-store.asc https://d.store.deepinos.org.cn/dcs-repo.gpg-key.asc") os.system(f"sudo gpg --dearmor /tmp/spark-store-install/spark-store.asc") - os.system(f"sudo cp /tmp/spark-store-install/spark-store.asc.gpg /etc/apt/trusted.gpg.d/spark-store.gpg") os.system(f"sudo apt update") os.system(f"sudo apt install {program}") os.system(f"sudo rm /etc/apt/sources.list.d/sparkstore-withwinerunner.list") + os.system(f"sudo rm /etc/apt/sources.list.d/deepin20-withwinerunner.list") + os.system(f"sudo apt update") os.system(f"sudo dpkg --remove-architecture i386") os.system(f"sudo apt update") @@ -64,7 +66,7 @@ if __name__ == "__main__": print("安装中……") InstallWithDeepinSource(i[1]) print("安装完成!") - exit() + #exit() for i in [ ["deepin-wine", "deepin-wine"], ["spark-wine7-devel", "spark-wine7-devel"] diff --git a/deb/opt/apps/deepin-wine-runner/InstallWineOnDeepin23.py b/deb/opt/apps/deepin-wine-runner/InstallWineOnDeepin23.py index 1c82677..8d06ff6 100755 --- a/deb/opt/apps/deepin-wine-runner/InstallWineOnDeepin23.py +++ b/deb/opt/apps/deepin-wine-runner/InstallWineOnDeepin23.py @@ -18,6 +18,7 @@ def InstallWithDeepinSource(program): os.system(f"sudo apt update") os.system(f"sudo apt install {program}") os.system(f"sudo rm /etc/apt/sources.list.d/deepin20-withwinerunner.list") + os.system(f"sudo apt update") os.system(f"sudo dpkg --remove-architecture i386") os.system(f"sudo apt update") @@ -29,10 +30,11 @@ def InstallWithSparkStoreSource(program): os.system(f"sudo rm -rf /tmp/spark-store-install/spark-store.asc") os.system(f"sudo wget -O /tmp/spark-store-install/spark-store.asc https://d.store.deepinos.org.cn/dcs-repo.gpg-key.asc") os.system(f"sudo gpg --dearmor /tmp/spark-store-install/spark-store.asc") - os.system(f"sudo cp /tmp/spark-store-install/spark-store.asc.gpg /etc/apt/trusted.gpg.d/spark-store.gpg") os.system(f"sudo apt update") os.system(f"sudo apt install {program}") os.system(f"sudo rm /etc/apt/sources.list.d/sparkstore-withwinerunner.list") + os.system(f"sudo rm /etc/apt/sources.list.d/deepin20-withwinerunner.list") + os.system(f"sudo apt update") os.system(f"sudo dpkg --remove-architecture i386") os.system(f"sudo apt update") @@ -64,7 +66,7 @@ if __name__ == "__main__": print("安装中……") InstallWithDeepinSource(i[1]) print("安装完成!") - exit() + #exit() for i in [ ["deepin-wine", "deepin-wine"], ["spark-wine7-devel", "spark-wine7-devel"] diff --git a/deb/opt/apps/deepin-wine-runner/deepin-wine-runner b/deb/opt/apps/deepin-wine-runner/deepin-wine-runner index d96017e..5ecdef0 100755 --- a/deb/opt/apps/deepin-wine-runner/deepin-wine-runner +++ b/deb/opt/apps/deepin-wine-runner/deepin-wine-runner @@ -977,17 +977,24 @@ information = json.loads(readtxt(f"{programPath}/information.json")) version = information["Version"] goodRunSystem = "常见 Linux" thankText = "" -tips = '''提示: +tips = '''
N: 鉴于仓库 'https://community-packages.deepin.com/beige beige InRelease' 不支持 'i386' 体系结构,跳过配置文件 'main/binary-i386/Packages' 的获取。'''
updateThingsString = '''※1、修复了打包器(非基于活动脚本) control、postrm 写入文件颠倒的问题
※2、内置一个微型的 Windows 应用商店(应用来源:腾讯软件管家)
-※3、初步支持 deepin 23
+※3、初步支持 deepin 23(添加基于 linglong Wine 的运行方式,需要安装一个 linglong 包的 使用 Wine 应用<此方式运行限制较多,详细请见程序提示>;添加从 Deepin 20 源获取 Wine 的安装方式<不推荐>)
4、更新了打包器(非基于活动脚本)调用星火 spark-wine-helper 的 run.sh 脚本格式
5、修复了打包器(基于活动脚本)在 dde-top-panel 和 dde-globalmenu-service 下无法打开帮助提示的问题
6、支持屏蔽 Wine 默认的 Mono、Gecko 安装器(屏蔽方法来自星火应用商店审核组和提供的新 run.sh 标准)
@@ -1019,7 +1026,7 @@ Qt 版本:{QtCore.qVersion()}
N: 鉴于仓库 'https://community-packages.deepin.com/beige beige InRelease' 不支持 'i386' 体系结构,跳过配置文件 'main/binary-i386/Packages' 的获取。'''
updateThingsString = '''※1、修复了打包器(非基于活动脚本) control、postrm 写入文件颠倒的问题
※2、内置一个微型的 Windows 应用商店(应用来源:腾讯软件管家)
-※3、初步支持 deepin 23
+※3、初步支持 deepin 23(添加基于 linglong Wine 的运行方式,需要安装一个 linglong 包的 使用 Wine 应用<此方式运行限制较多,详细请见程序提示>;添加从 Deepin 20 源获取 Wine 的安装方式<不推荐>)
4、更新了打包器(非基于活动脚本)调用星火 spark-wine-helper 的 run.sh 脚本格式
5、修复了打包器(基于活动脚本)在 dde-top-panel 和 dde-globalmenu-service 下无法打开帮助提示的问题
6、支持屏蔽 Wine 默认的 Mono、Gecko 安装器(屏蔽方法来自星火应用商店审核组和提供的新 run.sh 标准)
@@ -1019,7 +1026,7 @@ Qt 版本:{QtCore.qVersion()}