diff --git a/VM/VirtualMachine b/VM/VirtualMachine index 121eb43..23310af 100755 --- a/VM/VirtualMachine +++ b/VM/VirtualMachine @@ -2,7 +2,7 @@ import os import subprocess programPath = os.path.split(os.path.realpath(__file__))[0] # 返回 string -arch = subprocess.getoutput("arch").replace(" ", "").replace("\n", "") +arch = subprocess.getoutput("dpkg --print-architecture").replace(" ", "").replace("\n", "") if os.path.exists(f"{programPath}/VirtualMachine-{arch}"): os.system(f"{programPath}/VirtualMachine-{arch}") exit() diff --git a/VM/VirtualMachine-x86_64 b/VM/VirtualMachine-amd64 similarity index 94% rename from VM/VirtualMachine-x86_64 rename to VM/VirtualMachine-amd64 index 2be1dff..753c293 100755 Binary files a/VM/VirtualMachine-x86_64 and b/VM/VirtualMachine-amd64 differ diff --git a/VM/VirtualMachine-aarch64 b/VM/VirtualMachine-arm64 similarity index 94% rename from VM/VirtualMachine-aarch64 rename to VM/VirtualMachine-arm64 index 5e54da3..cc2719c 100755 Binary files a/VM/VirtualMachine-aarch64 and b/VM/VirtualMachine-arm64 differ diff --git a/VM/VirtualMachine-armv7l b/VM/VirtualMachine-armhf similarity index 96% rename from VM/VirtualMachine-armv7l rename to VM/VirtualMachine-armhf index ee4c428..47c6833 100755 Binary files a/VM/VirtualMachine-armv7l and b/VM/VirtualMachine-armhf differ diff --git a/VM/VirtualMachine-i686 b/VM/VirtualMachine-i386 similarity index 94% rename from VM/VirtualMachine-i686 rename to VM/VirtualMachine-i386 index 4242327..d436505 100755 Binary files a/VM/VirtualMachine-i686 and b/VM/VirtualMachine-i386 differ diff --git a/VM/VirtualMachine-loong64 b/VM/VirtualMachine-loong64 new file mode 100755 index 0000000..be1f139 Binary files /dev/null and b/VM/VirtualMachine-loong64 differ diff --git a/VM/VirtualMachine-loongarch64 b/VM/VirtualMachine-loongarch64 index 925411f..4536bd7 100755 Binary files a/VM/VirtualMachine-loongarch64 and b/VM/VirtualMachine-loongarch64 differ diff --git a/VM/VirtualMachine-mips64 b/VM/VirtualMachine-mips64el similarity index 93% rename from VM/VirtualMachine-mips64 rename to VM/VirtualMachine-mips64el index 746a786..cb846a0 100755 Binary files a/VM/VirtualMachine-mips64 and b/VM/VirtualMachine-mips64el differ diff --git a/VM/VirtualMachine-mips b/VM/VirtualMachine-mipsel similarity index 93% rename from VM/VirtualMachine-mips rename to VM/VirtualMachine-mipsel index 0adb3e1..838d3ad 100755 Binary files a/VM/VirtualMachine-mips and b/VM/VirtualMachine-mipsel differ diff --git a/VM/VirtualMachine-ppc b/VM/VirtualMachine-powerpc similarity index 95% rename from VM/VirtualMachine-ppc rename to VM/VirtualMachine-powerpc index b55a9f7..215e45f 100755 Binary files a/VM/VirtualMachine-ppc and b/VM/VirtualMachine-powerpc differ diff --git a/VM/VirtualMachine-ppc64el b/VM/VirtualMachine-ppc64el index 011ba0c..bafe944 100755 Binary files a/VM/VirtualMachine-ppc64el and b/VM/VirtualMachine-ppc64el differ diff --git a/VM/VirtualMachine-riscv64 b/VM/VirtualMachine-riscv64 index 0cb7b43..5f3c695 100755 Binary files a/VM/VirtualMachine-riscv64 and b/VM/VirtualMachine-riscv64 differ diff --git a/VM/VirtualMachine-s390x b/VM/VirtualMachine-s390x index 70eab01..94b3751 100755 Binary files a/VM/VirtualMachine-s390x and b/VM/VirtualMachine-s390x differ diff --git a/deb/DEBIAN/postinst b/deb/DEBIAN/postinst index fc228b5..b5becaf 100755 --- a/deb/DEBIAN/postinst +++ b/deb/DEBIAN/postinst @@ -51,8 +51,8 @@ if [ `arch` != "x86_64" ]; then rm -rf /opt/apps/deepin-wine-runner/InstallNewWineHQ.sh fi # 处理 VM 工具 -vmPath=/opt/apps/deepin-wine-runner/VM/VirtualMachine-`arch` -echo 当前架构为:`arch` +vmPath=/opt/apps/deepin-wine-runner/VM/VirtualMachine-`dpkg --print-architecture` +echo 当前架构为:`dpkg --print-architecture` if [ -f $vmPath ]; then echo 虚拟机工具有该架构的预编译文件 # 移除辅助文件 @@ -65,19 +65,20 @@ else rm -f /opt/apps/deepin-wine-runner/VM/VirtualMachine-* fi echo 处理完成! +# Gitlink 源挂了 # 到时候切换 gpg 源会方便很多 -if [ -r /etc/apt/sources.list.d/better-dde.list ]; then - if [ -d /usr/share/deepin-installer ]; then - # 用于修复 Deepin Community Live CD Install 版签名过期的问题 - wget -P /tmp/gfdgd-xi-sources https://code.gitlink.org.cn/gfdgd_xi/gfdgd-xi-apt-mirrors/raw/branch/master/gpg.asc - rm -rfv /etc/apt/trusted.gpg.d/gfdgdxi-list.gpg | true - cp -v /tmp/gfdgd-xi-sources/gpg.asc.gpg /etc/apt/trusted.gpg.d/gfdgdxi-list.gpg - # 用于修复 2022.11.25 Better DDE 导致的 Deepin Community Live CD Install 版问题 - # 移除 Better DDE 源 - rm -rfv /etc/apt/sources.list.d/better-dde.list - apt update > /dev/null 2>&1 | true - fi -fi +#if [ -r /etc/apt/sources.list.d/better-dde.list ]; then +# if [ -d /usr/share/deepin-installer ]; then +# # 用于修复 Deepin Community Live CD Install 版签名过期的问题 +# wget -P /tmp/gfdgd-xi-sources https://code.gitlink.org.cn/gfdgd_xi/gfdgd-xi-apt-mirrors/raw/branch/master/gpg.asc +# rm -rfv /etc/apt/trusted.gpg.d/gfdgdxi-list.gpg | true +# cp -v /tmp/gfdgd-xi-sources/gpg.asc.gpg /etc/apt/trusted.gpg.d/gfdgdxi-list.gpg +# # 用于修复 2022.11.25 Better DDE 导致的 Deepin Community Live CD Install 版问题 +# # 移除 Better DDE 源 +# rm -rfv /etc/apt/sources.list.d/better-dde.list +# apt update > /dev/null 2>&1 | true +# fi +#fi # 设置目录权限,让用户可读可写,方便后续删除组件 chmod 777 -R /opt/apps/deepin-wine-runner # 向服务器返回安装数加1(不显示内容且忽略错误) diff --git a/mainwindow.py b/mainwindow.py index a3b480b..3700ffa 100755 --- a/mainwindow.py +++ b/mainwindow.py @@ -2551,15 +2551,16 @@ updateThingsString = transla.transe("U", '''※1、修复简易打包器无法 ※7、修复虚拟机工具在检测到 Qemu 磁盘但没有安装 Qemu 时无法启动的问题 ※8、修复虚拟机工具的一些问题并调整部分设置 ※9、虚拟机工具支持设置 UEFI 启动 -10、高级打包器支持隐藏输入框以及使用小字体 -11、打包器提供 bcm 和 dcm wine 支持 -12、修复星火 wine 配置错误问题 -13、打包器支持多线程打包 -14、修复升级工具问题:https://gitee.com/gfdgd-xi/uengine-runner/issues/I6ZRZX -15、跟进打包器 run.sh 模板 -16、云沙箱新增 cloud.vdnel.cn -17、打包器新增分类 Game、System、AudioVideo -18、修复安装 Box64 时源里没有 libc6:armhf 导致无法安装的问题''') +※10、虚拟机安装工具提供 LoongArch 新世界版本 +11、高级打包器支持隐藏输入框以及使用小字体 +12、打包器提供 bcm 和 dcm wine 支持 +13、修复星火 wine 配置错误问题 +14、打包器支持多线程打包 +15、修复升级工具问题:https://gitee.com/gfdgd-xi/uengine-runner/issues/I6ZRZX +16、跟进打包器 run.sh 模板 +17、云沙箱新增 cloud.vdnel.cn +18、打包器新增分类 Game、System、AudioVideo +19、修复安装 Box64 时源里没有 libc6:armhf 导致无法安装的问题''') for i in information["Thank"]: thankText += f"{i}\n" updateTime = "2023年08月10日"